diff options
| -rw-r--r-- | rescue/Makefile | 2 | ||||
| -rwxr-xr-x | rescue/bin/drvinst (renamed from rescue/drvinst) | 0 | ||||
| -rwxr-xr-x | rescue/bin/guessmounts (renamed from rescue/guessmounts) | 0 | ||||
| -rwxr-xr-x | rescue/bin/install_bootloader (renamed from rescue/install_bootloader) | 0 | ||||
| -rwxr-xr-x | rescue/bin/lsparts (renamed from rescue/lsparts) | 0 | ||||
| -rwxr-xr-x | rescue/bin/rescue-doc (renamed from rescue/rescue-doc) | 0 | ||||
| -rwxr-xr-x | rescue/bin/restore_ms_boot (renamed from rescue/restore_ms_boot) | 0 | ||||
| -rw-r--r-- | rescue/list.xml | 29 | ||||
| -rwxr-xr-x | rescue/sbin/partimage_whole_disk (renamed from rescue/partimage_whole_disk) | 0 | ||||
| -rwxr-xr-x | rescue/tree/usr/lib/restore-image-lib.sh (renamed from rescue/restore-image-lib.sh) | 0 | ||||
| -rwxr-xr-x | rescue/tree/usr/sbin/diskdrake-resize (renamed from rescue/diskdrake-resize) | 0 | ||||
| -rwxr-xr-x | rescue/tree/usr/sbin/genpasswd (renamed from rescue/genpasswd) | 0 | ||||
| -rwxr-xr-x | rescue/tree/usr/sbin/grabjournallogs (renamed from rescue/grabjournallogs) | 0 | ||||
| -rwxr-xr-x | rescue/tree/usr/sbin/restore-image.sh (renamed from rescue/restore-image.sh) | 0 | ||||
| -rwxr-xr-x | rescue/tree/usr/sbin/startssh (renamed from rescue/startssh) | 0 |
15 files changed, 10 insertions, 21 deletions
diff --git a/rescue/Makefile b/rescue/Makefile index 473bdd14a..64e9119e3 100644 --- a/rescue/Makefile +++ b/rescue/Makefile @@ -10,7 +10,7 @@ all: $(RESCUE) install: $(RESCUE) cp -f $< $(STAGE2_DEST) -$(RESCUE): $(wildcard tree/**/*) list.xml drvinst guessmounts lsparts rescue-doc make_rescue_img +$(RESCUE): $(wildcard tree/**/*) $(wildcard bin/*) $(wildcard sbin/*) make_rescue_img list.xml aliases DISTRIB_DESCR=$(DISTRIB_DESCR) ./make_rescue_img dist: tar diff --git a/rescue/drvinst b/rescue/bin/drvinst index 4868b42e0..4868b42e0 100755 --- a/rescue/drvinst +++ b/rescue/bin/drvinst diff --git a/rescue/guessmounts b/rescue/bin/guessmounts index 27b920c9d..27b920c9d 100755 --- a/rescue/guessmounts +++ b/rescue/bin/guessmounts diff --git a/rescue/install_bootloader b/rescue/bin/install_bootloader index 7328de1d2..7328de1d2 100755 --- a/rescue/install_bootloader +++ b/rescue/bin/install_bootloader diff --git a/rescue/lsparts b/rescue/bin/lsparts index 8d36a02f4..8d36a02f4 100755 --- a/rescue/lsparts +++ b/rescue/bin/lsparts diff --git a/rescue/rescue-doc b/rescue/bin/rescue-doc index e6514b462..e6514b462 100755 --- a/rescue/rescue-doc +++ b/rescue/bin/rescue-doc diff --git a/rescue/restore_ms_boot b/rescue/bin/restore_ms_boot index 1f8cc2907..1f8cc2907 100755 --- a/rescue/restore_ms_boot +++ b/rescue/bin/restore_ms_boot diff --git a/rescue/list.xml b/rescue/list.xml index 29139f46d..d4c0adcb4 100644 --- a/rescue/list.xml +++ b/rescue/list.xml @@ -410,15 +410,18 @@ <filter command="../tools/simplify-drakx-modules"> <from dir="." expand="collect-perl-files /usr/lib/libDrakX /usr/lib/libDrakX"> - <to dir="/usr/bin"> - rescue-doc drvinst lsparts - guessmounts install_bootloader + <to dir="/usr"> + bin/rescue-doc + bin/drvinst + bin/lsparts + bin/guessmounts + bin/install_bootloader <if ARCH="i.86|x86_64"> - restore_ms_boot + bin/restore_ms_boot </if> </to> - <to dir="/usr/sbin"> - partimage_whole_disk + <to dir="/usr"> + sbin/partimage_whole_disk </to> </from> <from dir="/usr/lib/libDrakX" expand="glob"> @@ -439,20 +442,6 @@ dhcp-client </to> </from> -<from dir="."> - <to dir="/usr/sbin"> - diskdrake-resize - genpasswd - startssh - grabjournallogs - </to> - <to dir="/usr/sbin"> - restore-image.sh - </to> - <to dir="/usr/lib"> - restore-image-lib.sh - </to> -</from> <if set="RESCUE_FLASH"> <from expand="binary"> dirname diff --git a/rescue/partimage_whole_disk b/rescue/sbin/partimage_whole_disk index ed0653a95..ed0653a95 100755 --- a/rescue/partimage_whole_disk +++ b/rescue/sbin/partimage_whole_disk diff --git a/rescue/restore-image-lib.sh b/rescue/tree/usr/lib/restore-image-lib.sh index 3451f7be5..3451f7be5 100755 --- a/rescue/restore-image-lib.sh +++ b/rescue/tree/usr/lib/restore-image-lib.sh diff --git a/rescue/diskdrake-resize b/rescue/tree/usr/sbin/diskdrake-resize index 88372aac7..88372aac7 100755 --- a/rescue/diskdrake-resize +++ b/rescue/tree/usr/sbin/diskdrake-resize diff --git a/rescue/genpasswd b/rescue/tree/usr/sbin/genpasswd index 2f129673d..2f129673d 100755 --- a/rescue/genpasswd +++ b/rescue/tree/usr/sbin/genpasswd diff --git a/rescue/grabjournallogs b/rescue/tree/usr/sbin/grabjournallogs index ef2ea4a1d..ef2ea4a1d 100755 --- a/rescue/grabjournallogs +++ b/rescue/tree/usr/sbin/grabjournallogs diff --git a/rescue/restore-image.sh b/rescue/tree/usr/sbin/restore-image.sh index f4f904f3f..f4f904f3f 100755 --- a/rescue/restore-image.sh +++ b/rescue/tree/usr/sbin/restore-image.sh diff --git a/rescue/startssh b/rescue/tree/usr/sbin/startssh index e14bb10e8..e14bb10e8 100755 --- a/rescue/startssh +++ b/rescue/tree/usr/sbin/startssh |