branch to build the firewall install.topic/unlabeled-1.1.1

6 files changed, 73 insertions, 18 deletions

diff --git a/rescue/tree/boot/grub/menu.lst b/rescue/tree/boot/grub/menu.lst
index 372c24902..c74b13ee7 100644
--- a/rescue/tree/boot/grub/menu.lst
+++ b/rescue/tree/boot/grub/menu.lst
@@ -1,5 +1,5 @@
 timeout 0
 
 title oem
-kernel (hd0,0)/boot/vmlinuz ramdisk_size=32000 hd vga=788 flang=fr_FR fclass=normal oem
+kernel (hd0,0)/boot/vmlinuz ramdisk_size=32000 hd vga=788 fclass=normal oem
 initrd (hd0,0)/boot/hd.rdz
diff --git a/rescue/tree/etc/issue b/rescue/tree/etc/issue
index 8c579e127..9b04ad8cd 100644
--- a/rescue/tree/etc/issue
+++ b/rescue/tree/etc/issue
@@ -18,7 +18,7 @@
                       
 
 
-Linux Mandrake release 7.0 (Air)
+Linux Mandrake release 7.2 (Odyssey)
 
 Use loadkeys to change your keyboard layout (eg: loadkeys fr)
 Use modprobe to load modules
diff --git a/rescue/tree/etc/oem b/rescue/tree/etc/oem
index e95d572e1..f30c9a433 100755
--- a/rescue/tree/etc/oem
+++ b/rescue/tree/etc/oem
@@ -2,12 +2,20 @@
 
 [ "$1" = "-f" ] || { echo "Call it with option -f, but don't fear loosing all your data, this command is dangerous!"; exit 1; }
 
-echo "I'm going to install the oem version on your hard drive"
-echo "!!ALL DATA IS GOING TO BE LOST!!"
-echo
-echo "Press enter to go on"
+inst=1
+swap=2
+root=3
 
-read
+yes=
+while [ "$yes" != "yes" ]; do
+    echo
+    echo
+    echo "I'm going to install the OEM version on your hard drive"
+    echo "!!ALL DATA IS GOING TO BE LOST!!"
+    echo
+    echo "Type \`\`yes'' and [enter] to go on"
+    read yes
+done
 
 cd /proc/ide
 for i in hd*; do
@@ -20,22 +28,62 @@ echo "cdrom: $cd"
 
 mkdir /cdrom ; mount -r -t iso9660 $cd /cdrom
 
+if grep -q "[ -]fr" /cdrom/VERSION; then
+  lang=fr
+  flang=fr_FR
+else
+  lang=en
+  flang=en_US
+fi
+echo "Found lang $lang"
+
 echo "Installing new partition table and bootloader"
 dd if=/etc/part_and_bootloader of=$hd
   
 echo "Asking kernel to take into account this new partition table"
 kernel_read_part $hd
 
-echo "Formatting (ext2) partition"
-mkfs.ext2 ${hd}1
+echo "Setting swap"
+mkswap $hd$swap
+swapon $hd$swap
+
+echo "Formatting $hd$inst partition" ; mkfs.ext2 $hd$inst
+echo "Formatting $hd$root partition" ; mkfs.ext2 $hd$root
+
+echo "Mounting partitions"
+mkdir -p /hd ; mount -t ext2 $hd$inst /hd
+mkdir -p /mnt; mount -t ext2 $hd$root /mnt
 
-echo "Mounting partition"
-mkdir /hd ; mount -t ext2 ${hd}1 /hd
+echo "Copying installation on hard drive"
+cp -a /boot /cdrom/boot /hd
+mkdir -p /hd/Mandrake /hd/Mandrake/RPMS
+cp -a /cdrom/Mandrake/base /cdrom/Mandrake/mdkinst /hd/Mandrake
 
-echo "Copying cdrom on hard drive"
-cp -a /boot /cdrom/boot /cdrom/Mandrake /hd
-rm /hd/Mandrake/mdkinst/usr/bin/runinstall2
+perl -pi -e "s/^(kernel .*)/\1 flang=$flang/" /hd/boot/grub/menu.lst
 
-echo "Done, oem hard drive ready! Press enter to reboot"
+for i in `/etc/closurepkgs /hd/Mandrake/base/depslist.ordered /hd/Mandrake/base/compssList $lang | grep C: | cut -d: -f2`; do
+    [ -e /cdrom/Mandrake/RPMS/$i.*.rpm ] && cp -a /cdrom/Mandrake/RPMS/$i.*.rpm /hd/Mandrake/RPMS
+done
+
+echo "Installing packages"
+export DURING_INSTALL=1
+export RPM_INSTALL_LANG=$lang
+export LD_LIBRARY_PATH=/usr/X11R6/lib
+export SECURE_LEVEL=2
+for i in /etc /var/lib/rpm /proc ; do mkdir -p /mnt$i; done
+mount -t proc proc /mnt/proc
+rpm --root /mnt --initdb
+echo >/mnt/etc/fstab "$hd$root / ext2 defaults 1 1"
+for i in `/etc/closurepkgs /hd/Mandrake/base/depslist.ordered /hd/Mandrake/base/compssList $lang | grep I: | cut -d: -f2`; do
+    [ -e /cdrom/Mandrake/RPMS/$i.*.rpm ] && rpm --root /mnt -ivh /cdrom/Mandrake/RPMS/$i.*.rpm --nodeps --force
+done
+umount /mnt/proc
+umount /cdrom
+eject $cd
+
+echo
+echo "Done. OEM hard drive ready!"
+echo "The hard drive is now ready for a customer."
+echo "Press enter to halt."
 read
-reboot
\ No newline at end of file
+halt
diff --git a/rescue/tree/etc/profile b/rescue/tree/etc/profile
index ffd2b3174..ce6db9cd7 100644
--- a/rescue/tree/etc/profile
+++ b/rescue/tree/etc/profile
@@ -6,7 +6,7 @@
 
 PROFILE_LOADED=1
 
-export PATH=/bin:/sbin:/usr/bin:/usr/sbin
+export PATH=/usr/bin:/bin:/sbin:/usr/sbin:/usr/X11R6/bin:/mnt/disk/sbin:/mnt/disk/bin:/mnt/disk/usr/sbin:/mnt/disk/usr/bin:/mnt/disk/usr/X11R6/bin
 
 PS1="[root@rescue]\\$ "
 ls () { /bin/ls --color=auto -F "$@";}
diff --git a/rescue/tree/etc/rc.sysinit b/rescue/tree/etc/rc.sysinit
index 476c9bfe9..8fb6aea63 100755
--- a/rescue/tree/etc/rc.sysinit
+++ b/rescue/tree/etc/rc.sysinit
@@ -17,12 +17,18 @@ mount -f /proc
 action "Setting hostname rescue" hostname rescue
 echo rescue > /etc/HOSTNAME
 
+# Loads common modules ( no kerneld :( )
 load() { modprobe $* 2>/dev/null; }
 load ide-mod
 load ide-probe
 load ide-disk
 load ide-cd
 load af_packet
+load isofs
+load vfat
+load reiserfs
+
+grep -q oem /proc/cmdline && exec /etc/oem -f
 
 /sbin/ifconfig lo 127.0.0.1 netmask 255.0.0.0
 /sbin/route add 127.0.0.1 lo
diff --git a/rescue/tree/sbin/modprobe b/rescue/tree/sbin/modprobe
index 494f5b2a2..574f8ff56 100755
--- a/rescue/tree/sbin/modprobe
+++ b/rescue/tree/sbin/modprobe
@@ -27,9 +27,10 @@ sub load {
     $conf{$name}{loaded} and return;
     eval { load($_, 'prereq') } foreach @{$deps{$name}};
 
-    system("extract_archive /modules/modules.cz* /tmp $name.o >/dev/null");
+    system("packdrake -x /modules/modules.cz* /tmp $name.o");
     -r "/tmp/$name.o" or die "can't find module $name\n";
     system("/sbin/insmod -f /tmp/$name.o"); $? and die("insmod $name failed");
+    system("rm /tmp/$name.o");
 }
 
 !@ARGV || $ARGV[0] =~ /-h/ and die "usage: modprobe <module> [<options...>]\n";