Branch for updates

17 files changed, 239 insertions, 0 deletions

diff --git a/rescue/tree/bin/insmod b/rescue/tree/bin/insmod
new file mode 100755
index 000000000..49b298142
--- /dev/null
+++ b/rescue/tree/bin/insmod
@@ -0,0 +1,2 @@
+#!/bin/sh
+echo "Use modprobe instead"
diff --git a/rescue/tree/bin/login b/rescue/tree/bin/login
new file mode 100755
index 000000000..4b2816926
--- /dev/null
+++ b/rescue/tree/bin/login
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /bin/bash --login
diff --git a/rescue/tree/etc/fstab b/rescue/tree/etc/fstab
new file mode 100644
index 000000000..fbafb7801
--- /dev/null
+++ b/rescue/tree/etc/fstab
@@ -0,0 +1,4 @@
+/dev/ram3 / ext2 defaults 1 1
+/dev/fd0 /mnt/floppy auto defaults,noauto 0 0
+none /proc proc defaults,noauto,ro 0 0
+/dev/cdrom /mnt/cdrom auto defaults,noauto 0 0
diff --git a/rescue/tree/etc/group b/rescue/tree/etc/group
new file mode 100644
index 000000000..5ba713c83
--- /dev/null
+++ b/rescue/tree/etc/group
@@ -0,0 +1 @@
+root::0:root
diff --git a/rescue/tree/etc/host.conf b/rescue/tree/etc/host.conf
new file mode 100644
index 000000000..1a8c1e151
--- /dev/null
+++ b/rescue/tree/etc/host.conf
@@ -0,0 +1,2 @@
+order hosts,bind
+multi on
diff --git a/rescue/tree/etc/hosts b/rescue/tree/etc/hosts
new file mode 100644
index 000000000..d02c36416
--- /dev/null
+++ b/rescue/tree/etc/hosts
@@ -0,0 +1 @@
+127.0.0.1		mageia-rescue
diff --git a/rescue/tree/etc/inittab b/rescue/tree/etc/inittab
new file mode 100644
index 000000000..771d7c0d4
--- /dev/null
+++ b/rescue/tree/etc/inittab
@@ -0,0 +1,14 @@
+#Inittab for Mandrake Rescue Disk
+#Author: Daouda Lo <daouda@mandrakesoft.com>
+id:3:initdefault:
+
+si::sysinit:/etc/rc.sysinit
+re:6:wait:/etc/rc.reboot
+ca:12345:ctrlaltdel:/sbin/fakeshutdown
+
+1:12345:respawn:/sbin/mingetty --autologin root tty1
+2:23:respawn:/sbin/mingetty tty2
+3:23:respawn:/sbin/mingetty tty3
+4:23:respawn:/sbin/mingetty tty4
+5:23:respawn:/sbin/mingetty tty5
+6:23:respawn:/sbin/mingetty tty6
diff --git a/rescue/tree/etc/issue b/rescue/tree/etc/issue
new file mode 100644
index 000000000..d4aee6d89
--- /dev/null
+++ b/rescue/tree/etc/issue
@@ -0,0 +1,28 @@
+
+
+                      
+                                          
+                                       
+                                      
+                                        
+         `----'                               
+                      
+                      
+                      [2[1;37;4
+                      
+                      
+                      Mageia Linux Rescue Disk
+                      
+                      
+                      
+                      
+
+
+DISTRIB_DESCR
+
+Use loadkeys to change your keyboard layout (eg: loadkeys fr)
+Use modprobe to load modules (eg: modprobe snd-card-fm801)
+Use drvinst to install drivers according to detected devices
+Use lsparts to list your partitions with types
+Use rescue-gui to go back to the rescue menu
+
diff --git a/rescue/tree/etc/passwd b/rescue/tree/etc/passwd
new file mode 100644
index 000000000..568451e4e
--- /dev/null
+++ b/rescue/tree/etc/passwd
@@ -0,0 +1,3 @@
+root::0:0::/:/bin/bash
+shutdown:*:6:0:shutdown:/sbin:/sbin/shutdown
+halt:*:7:0:halt:/sbin:/sbin/halt
diff --git a/rescue/tree/etc/profile b/rescue/tree/etc/profile
new file mode 100644
index 000000000..3b5ac21cc
--- /dev/null
+++ b/rescue/tree/etc/profile
@@ -0,0 +1,24 @@
+# /etc/profile
+# (c) Mandrakesoft, Chmouel Boudjnah <chmouel@mandrakesoft.com>
+
+# System wide environment and startup programs
+# Functions and aliases go in /etc/bashrc
+
+PROFILE_LOADED=1
+
+export PATH=/usr/bin:/bin:/sbin:/usr/sbin:/usr/X11R6/bin
+
+PS1="[root@rescue \w]\\$ "
+ls () { /bin/ls --color=auto -F "$@";}
+ll () { /bin/ls --color=auto -Fl "$@";}
+d () { /bin/ls --color=auto -F "$@";}
+s () { cd .. ;}
+which () { type -p "$@" ;}
+HOSTNAME=rescue
+HISTSIZE=1000
+HISTFILESIZE=1000
+
+INPUTRC=/etc/inputrc
+export PATH PS1 USER HOSTNAME HISTSIZE HISTFILESIZE INPUTRC
+
+cat /etc/issue
diff --git a/rescue/tree/etc/rc.reboot b/rescue/tree/etc/rc.reboot
new file mode 100755
index 000000000..0b67416f1
--- /dev/null
+++ b/rescue/tree/etc/rc.reboot
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+sleep 1
+/sbin/killall5 -9
+
+umount -a -f -t noproc
+
+reboot -i -d
diff --git a/rescue/tree/etc/rc.sysinit b/rescue/tree/etc/rc.sysinit
new file mode 100755
index 000000000..e5164dd45
--- /dev/null
+++ b/rescue/tree/etc/rc.sysinit
@@ -0,0 +1,83 @@
+#!/bin/sh
+
+action() { echo $1; shift; $*; }
+DATE=`date +%Y%m%d-%Hh%M`
+KADIR="/ka2"
+
+export PATH=/bin:/sbin:/usr/bin:/usr/sbin
+
+echo -e "\t\t\tWelcome to \\033[1;36mMageia\\033[0;39m Linux"
+
+action "Remounting root filesystem in read-write mode" mount -n -o remount,rw /
+
+ln -s /tmp/stage2/etc/* /etc 2>/dev/null
+
+rm -f /dev ; cp -a /tmp/stage2/dev /dev
+
+mkdir -p /mnt /var/log
+
+>/etc/mtab
+mount -f /
+mount -f /proc
+
+# Set the hostname.
+action "Setting hostname rescue" hostname rescue
+echo rescue > /etc/HOSTNAME
+
+# Loads common modules ( no kerneld :( )
+echo "Loading additional modules..."
+load() { modprobe $* 2>/dev/null; }
+load ide-gd_mod
+load ide-cd_mod
+load floppy
+load af_packet
+load isofs
+load vfat
+load ext3
+load ext4
+load reiserfs
+load xfs
+load jfs
+load loop
+load sd_mod
+load sr_mod
+
+/sbin/ifconfig lo 127.0.0.1 netmask 255.0.0.0
+/sbin/route add 127.0.0.1 lo
+
+# disable the weird echoprt in cooked mode for user interaction:
+stty sane
+
+#LANGUAGE (filled by make_rescue_img)
+
+grep -q noauto /proc/cmdline || drvinst SERIAL_USB
+
+partimage_default_dir=/data/box
+partimage_dir=`perl -lne 'print $1 if /BOX=(\S+)/' /proc/cmdline`
+[ -z "$partimage_dir" ] && partimage_dir=$partimage_default_dir
+partimage_server=`perl -lne 'print $1 if /\bpserver=(\S+)/' /proc/cmdline`
+
+if grep -q save_all /proc/cmdline; then
+    partimage_whole_disk -s $partimage_server save_all $partimage_default_dir
+elif grep -q rest_all /proc/cmdline; then
+    if [ -d /tmp/image$partimage_dir ]; then
+        partimage_whole_disk rest_all /tmp/image$partimage_dir
+    else
+        partimage_whole_disk -s $partimage_server rest_all $partimage_dir
+    fi
+elif grep -q oem /proc/cmdline; then
+    /tmp/image/oem-rescue.sh
+elif grep -q restore /proc/cmdline; then
+    /usr/sbin/restore-image.sh
+elif grep -q kamethod /proc/cmdline; then
+    echo "Welcome to Ka"
+    drvinst 
+    ln -sf /tmp/stage2/ka $KADIR
+    ln -sf /tmp/stage2/disk /disk
+    cd $KADIR
+    echo "-------- Starting LOG server -------------"
+    perl send_status.pl > /tmp/kacmd &
+    exec ./ka_replication.sh > /tmp/ka_log-$HOSTNAME-$DATE 2>&1
+elif ! grep -q expert /proc/cmdline; then
+    rescue-gui
+fi
diff --git a/rescue/tree/etc/resolv.conf b/rescue/tree/etc/resolv.conf
new file mode 100644
index 000000000..3822939b1
--- /dev/null
+++ b/rescue/tree/etc/resolv.conf
@@ -0,0 +1,2 @@
+search foo.com
+nameserver 192.168.1.1
diff --git a/rescue/tree/sbin/fakeshutdown b/rescue/tree/sbin/fakeshutdown
new file mode 100755
index 000000000..3511020ff
--- /dev/null
+++ b/rescue/tree/sbin/fakeshutdown
@@ -0,0 +1,39 @@
+#!/usr/bin/perl
+
+#
+# Guillaume Cottenceau (gc@mandrakesoft.com)
+#
+# Copyright 2001 Mandrakesoft
+#
+# This software may be freely redistributed under the terms of the GNU
+# public license.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+
+sub cat_ { local *F; open F, $_[0] or $_[1] ? die "cat of file $_[0] failed: $!\n" : return; my @l = <F>; wantarray ? @l : join '', @l }
+
+print "\n";
+
+
+#- try to umount as much as possible; uses Pixel's ultra optimized algo (let you guess how it works..)
+print "Umounting:\n";
+my @mounts = cat_('/proc/mounts');
+my $something_moved;
+do {
+    $something_moved = 0;
+    foreach (@mounts) {
+	my $where = (split)[1];
+	next if $where eq '/'; #- ouch! umounting the ramdisk on / always succeeds, and makes it becoming ro :-(
+	if (!system("umount $where 2>/dev/null")) {
+	    print "\t$where\n";
+	    $something_moved++;
+	}
+    }
+} while $something_moved;
+
+
+#- shutdown with init
+exec '/sbin/init', 6;
diff --git a/rescue/tree/sbin/modprobe b/rescue/tree/sbin/modprobe
new file mode 100755
index 000000000..a9cd91a89
--- /dev/null
+++ b/rescue/tree/sbin/modprobe
@@ -0,0 +1,16 @@
+#!/usr/bin/perl
+
+use lib qw(/usr/lib/libDrakX);
+use list_modules;
+use modules;
+
+# based on install::commands
+sub modprobe {
+    !@_ || $_[0] =~ /^-?-h/ and die "usage: modprobe <module> [<options...>]\n";
+    my $name = shift;
+    list_modules::load_default_moddeps();
+    modules::load_with_options([ $name ], { $name => join(' ', @_) });
+}
+
+$::isInstall = 1;
+modprobe(@ARGV);
diff --git a/rescue/tree/usr/lib/CVS. b/rescue/tree/usr/lib/CVS.
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/rescue/tree/usr/lib/CVS.
diff --git a/rescue/tree/usr/share/symlinks b/rescue/tree/usr/share/symlinks
new file mode 100644
index 000000000..5862fb8ac
--- /dev/null
+++ b/rescue/tree/usr/share/symlinks
@@ -0,0 +1,10 @@
+/bin
+/boot
+/dev
+/etc/fstab
+/etc/inittab
+/etc/rc.sysinit
+/lib
+/lib64
+/sbin
+/usr