Commit graph

475 commits

Author SHA1 Message Date
San Mehat
e00d31aeb1 am 0389a12: toolbox: Make that \'pointopoint\' instead of \'pointtopoint\'
Merge commit '0389a1297d65321a882ea0dcc69f4de4e3bcb169'

* commit '0389a1297d65321a882ea0dcc69f4de4e3bcb169':
  toolbox: Make that 'pointopoint' instead of 'pointtopoint'
2009-05-13 12:52:53 -07:00
San Mehat
4676aacd5e am fa49e28: toolbox: Add \'pointopoint\' support to ifconfig
Merge commit 'fa49e2860bebe6bb2a26194c58992e5d5aed0b0d'

* commit 'fa49e2860bebe6bb2a26194c58992e5d5aed0b0d':
  toolbox: Add 'pointopoint' support to ifconfig
2009-05-13 12:52:53 -07:00
San Mehat
0389a1297d toolbox: Make that 'pointopoint' instead of 'pointtopoint'
Signed-off-by: San Mehat <san@google.com>
2009-05-13 12:01:52 -07:00
San Mehat
fa49e2860b toolbox: Add 'pointopoint' support to ifconfig
Signed-off-by: San Mehat <san@google.com>
2009-05-13 10:05:06 -07:00
Jean-Baptiste Queru
f6c95712c4 Merge donut into master 2009-04-22 17:12:44 -07:00
Chung-yih Wang
41e3a2c5e8 Merge branch 'readonly-p4-master' 2009-04-18 16:17:34 -07:00
Chung-yih Wang
f309f77adc AI 146558: am: CL 146260 Add the net-based routing entries.
e.g. route add net 172.16.0.0 mask 255.240.0.0 gw 172.19.248.10
  Original author: cywang

Automated import of CL 146558
2009-04-18 16:16:21 -07:00
Chung-yih Wang
8b0fb371c1 Merge branch 'readonly-p4-donut' into donut 2009-04-14 18:46:50 -07:00
Chung-yih Wang
98c297f244 AI 146260: Add the net-based routing entries.
e.g. route add net 172.16.0.0 mask 255.240.0.0 gw 172.19.248.10

Automated import of CL 146260
2009-04-14 18:45:32 -07:00
Andy McFadden
33d50dc785 Merge branch 'readonly-p4-master' 2009-04-08 19:26:45 -07:00
Andy McFadden
b33d3415b6 AI 145220: Added "-d" flag to ls.
Now you can "ls -l -d <directory>" to see directory perms.

Automated import of CL 145220
2009-04-08 19:25:35 -07:00
Dianne Hackborn
477b430700 Improvements to get events: -p, better output.
Add new -p option to easily get the output showing which events are reported by the devices.

Improve the reported events output a bit by including a name for each event type.

Extend help text to include a description of each options, so I don't have to look in the source code next time. :)
2009-04-08 15:43:31 -07:00
The Android Open Source Project
455a6dffd4 Merge branch 'open_source' into google_internal 2009-03-29 08:55:26 -07:00
Doug Kwan
e49f9c9238 Automated import from //branches/master/...@142981,142981 2009-03-26 14:14:15 -07:00
Jean-Baptiste Queru
83b65486be Merge commit 'remotes/korg/cupcake' into merge
Conflicts:
	init/devices.c
	libpixelflinger/Android.mk
2009-03-18 09:29:29 -07:00
The Android Open Source Project
dd7bc3319d auto import from //depot/cupcake/@135843 2009-03-03 19:32:55 -08:00
The Android Open Source Project
e54eebbf1a auto import from //depot/cupcake/@135843 2009-03-03 18:29:04 -08:00
The Android Open Source Project
a1e1c1b106 auto import from //depot/cupcake/@132589 2009-03-03 14:04:41 -08:00
The Android Open Source Project
c2d26a164f auto import from //depot/cupcake/@137055 2009-03-02 22:54:47 -08:00
The Android Open Source Project
261ed7551e auto import from //branches/cupcake/...@132276 2009-02-19 10:57:36 -08:00
The Android Open Source Project
13f797da7f auto import from //branches/cupcake/...@130745 2009-02-10 15:44:07 -08:00
Jean-Baptiste Queru
77d0c65b95 Merge commit 'remotes/korg/cupcake'
Conflicts:
	init/devices.c
	logwrapper/logwrapper.c
	mountd/AutoMount.c
2008-12-19 08:15:15 -08:00
The Android Open Source Project
35237d1358 Code drop from //branches/cupcake/...@124589 2008-12-17 18:08:08 -08:00
Jay Freeman (saurik)
bc7b0cbe15 Open file and loop device with O_RDONLY when -o loop,ro.
Otherwise: ioctl LOOP_SET_FD failed: Bad file number.
2008-11-16 13:28:23 +00:00
The Android Open Source Project
4f6e8d7a00 Initial Contribution 2008-10-21 07:00:00 -07:00