diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-04-25 12:26:16 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-04-25 12:26:16 +0000 |
| commit | 126777bc019a54afb4ec51299f2cf9d2841698aa (patch) | |
| tree | 97f76e571902ead55ba138f1156a4b4f00b9b779 /rescue/tree | |
| parent | f1f67448efc714873378dfeb8279fae68054a90a (diff) | |
| download | drakx-backup-do-not-use-126777bc019a54afb4ec51299f2cf9d2841698aa.tar drakx-backup-do-not-use-126777bc019a54afb4ec51299f2cf9d2841698aa.tar.gz drakx-backup-do-not-use-126777bc019a54afb4ec51299f2cf9d2841698aa.tar.bz2 drakx-backup-do-not-use-126777bc019a54afb4ec51299f2cf9d2841698aa.tar.xz drakx-backup-do-not-use-126777bc019a54afb4ec51299f2cf9d2841698aa.zip | |
re-sync after the big svn loss
Diffstat (limited to 'rescue/tree')
| -rwxr-xr-x | rescue/tree/etc/rc.sysinit | 13 | ||||
| -rwxr-xr-x | rescue/tree/sbin/modprobe | 6 | ||||
| -rw-r--r-- | rescue/tree/usr/share/symlinks | 1 |
3 files changed, 4 insertions, 16 deletions
diff --git a/rescue/tree/etc/rc.sysinit b/rescue/tree/etc/rc.sysinit index 893efb338..e6da12ea0 100755 --- a/rescue/tree/etc/rc.sysinit +++ b/rescue/tree/etc/rc.sysinit @@ -12,23 +12,12 @@ ln -s /tmp/stage2/etc/* /etc 2>/dev/null rm -f /dev ; cp -a /tmp/stage2/dev /dev -mkdir /mnt /var/log - -mkdir /proc -action "Mounting proc filesystem" mount -n -t proc /proc /proc - -if grep -q sysfs /proc/filesystems; then - mkdir /sys - action "Mounting sysfs on /sys" mount -t sysfs none /sys -fi +mkdir -p /mnt /var/log >/etc/mtab mount -f / mount -f /proc -#- free up stage1 memory -umount /stage1/proc/bus/usb /stage1/proc /stage1 - # Set the hostname. action "Setting hostname rescue" hostname rescue echo rescue > /etc/HOSTNAME diff --git a/rescue/tree/sbin/modprobe b/rescue/tree/sbin/modprobe index 774101d7c..b8d6aecb2 100755 --- a/rescue/tree/sbin/modprobe +++ b/rescue/tree/sbin/modprobe @@ -13,7 +13,7 @@ sub load_deps($) { my ($file) = @_; local *F; - open F, $file or log::l("error opening $file: $!"), return 0; + open F, $file or warn "error opening $file: $!\n", return 0; foreach (<F>) { my ($f, $deps) = split ':'; push @{$deps{$f}}, split ' ', $deps; @@ -41,7 +41,7 @@ sub load { $conf{$name}{loaded} and return; eval { load($_, 'prereq') } foreach @{$deps{$name}}; - system("packdrake -x /modules/modules.cz* /tmp $name$module_extension"); + system("gzip -dc /modules/$name$module_extension.gz > /tmp/$name$module_extension"); -r "/tmp/$name$module_extension" or die "can't find module $name\n"; system("/sbin/insmod /tmp/$name$module_extension"); my $retval = $?; @@ -49,7 +49,7 @@ sub load { $retval and die("insmod $name failed"); } -!@ARGV || $ARGV[0] =~ /-h/ and die "usage: modprobe <module> [<options...>]\n"; +!@ARGV || $ARGV[0] =~ /^-?-h/ and die "usage: modprobe <module> [<options...>]\n"; read_already_loaded(); load_deps("/modules/modules.dep"); diff --git a/rescue/tree/usr/share/symlinks b/rescue/tree/usr/share/symlinks index 1c34ff204..5862fb8ac 100644 --- a/rescue/tree/usr/share/symlinks +++ b/rescue/tree/usr/share/symlinks @@ -6,6 +6,5 @@ /etc/rc.sysinit /lib /lib64 -/modules /sbin /usr |