8 files changed, 4 insertions, 130 deletions

diff --git a/rescue/tree/etc/fstab b/rescue/tree/etc/fstab
index 9280d8ee0..fbafb7801 100644
--- a/rescue/tree/etc/fstab
+++ b/rescue/tree/etc/fstab
@@ -1,6 +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
-devpts /dev/pts devpts gid=5,mode=620,noauto 0 0
-tmpfs /dev/shm tmpfs defaults,noauto 0 0
 /dev/cdrom /mnt/cdrom auto defaults,noauto 0 0
diff --git a/rescue/tree/etc/hostname b/rescue/tree/etc/hostname
new file mode 100644
index 000000000..344f71bc8
--- /dev/null
+++ b/rescue/tree/etc/hostname
@@ -0,0 +1 @@
+rescue
diff --git a/rescue/tree/etc/inittab b/rescue/tree/etc/inittab
deleted file mode 100644
index 6a30c0360..000000000
--- a/rescue/tree/etc/inittab
+++ /dev/null
@@ -1,16 +0,0 @@
-#Inittab for Mageia Rescue Disk
-#Author: Daouda Lo
-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 --autologin root tty2
-3:23:respawn:/sbin/mingetty --autologin root tty3
-4:23:respawn:/sbin/mingetty --autologin root tty4
-5:23:respawn:/sbin/mingetty --autologin root tty5
-6:23:respawn:/sbin/mingetty --autologin root tty6
-s0:2345:respawn:/sbin/agetty -h -t 60 ttyS0 9600 ansi
-#s1:2345:respawn:/sbin/agetty -h -t 60 ttyS1 115200,9600 linux
diff --git a/rescue/tree/etc/issue b/rescue/tree/etc/issue
index c5a4c7fb8..11f9f3102 100644
--- a/rescue/tree/etc/issue
+++ b/rescue/tree/etc/issue
@@ -26,4 +26,5 @@ Use drvinst to install drivers according to detected devices
 Use lsparts to list your partitions with types
 Use startssh to start an ssh daemon
 Use rescue-gui to go back to the rescue menu
+Use grabjournallogs to grab the last 24 hours of journal logs
 
diff --git a/rescue/tree/etc/passwd b/rescue/tree/etc/passwd
index 3a1254f77..c0274a116 100644
--- a/rescue/tree/etc/passwd
+++ b/rescue/tree/etc/passwd
@@ -1,3 +1,2 @@
 root::0:0::/root:/bin/bash
-shutdown:*:6:0:shutdown:/sbin:/sbin/shutdown
-halt:*:7:0:halt:/sbin:/sbin/halt
+messagebus:x:1:1::/:/sbin/nologin
diff --git a/rescue/tree/etc/profile b/rescue/tree/etc/profile
index 3478e2971..17f0700dc 100644
--- a/rescue/tree/etc/profile
+++ b/rescue/tree/etc/profile
@@ -6,7 +6,7 @@
 
 PROFILE_LOADED=1
 
-export PATH=/usr/bin:/bin:/sbin:/usr/sbin:/usr/X11R6/bin
+PATH=/usr/bin:/bin:/sbin:/usr/sbin:/mnt/sbin:/mnt/bin:/mnt/usr/sbin:/mnt/usr/bin
 
 PS1="[root@rescue \w]\\$ "
 ls () { /bin/ls --color=auto -F "$@";}
diff --git a/rescue/tree/etc/rc.reboot b/rescue/tree/etc/rc.reboot
deleted file mode 100755
index 0b67416f1..000000000
--- a/rescue/tree/etc/rc.reboot
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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
deleted file mode 100755
index 96d2f7d88..000000000
--- a/rescue/tree/etc/rc.sysinit
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/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 /
-
-echo "Starting udev"
-mkdir /run
-mount -t tmpfs -o mode=0755,nosuid,nodev tmpfs /run
-mkdir -p /run/udev/rules.d
-export UDEVRULESD=/run/udev/rules.d
-mount -t devtmpfs -o mode=0755,nosuid devtmpfs /dev
-mkdir /dev/pts
-mkdir /dev/shm
-mount /dev/pts
-mount /dev/shm
-
-/lib/udev/udevd --daemon --resolve-names=never
-udevadm trigger --type=subsystems --action=add
-udevadm trigger --type=devices --action=add
-
-ln -s /tmp/stage2/etc/* /etc 2>/dev/null
-# make passwd changable
-rm -f /etc/passwd
-cp /tmp/stage2/etc/passwd /etc/
-
-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
-
-echo "Setting local loop"
-/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
-    echo "starting GUI"
-    rescue-gui
-fi