summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaarten Vanraes <alien@mageia.org>2012-02-25 16:09:50 +0000
committerMaarten Vanraes <alien@mageia.org>2012-02-25 16:09:50 +0000
commit2b26ee7be0a60371a187a1c8ec9fc5f7236b156f (patch)
tree14d9de16b348176d55b565928bb8c09bf8b0a2ab
parent79a2cfd730452ba03d1733a70f2f6df65c00e712 (diff)
downloaddrakx-2b26ee7be0a60371a187a1c8ec9fc5f7236b156f.tar
drakx-2b26ee7be0a60371a187a1c8ec9fc5f7236b156f.tar.gz
drakx-2b26ee7be0a60371a187a1c8ec9fc5f7236b156f.tar.bz2
drakx-2b26ee7be0a60371a187a1c8ec9fc5f7236b156f.tar.xz
drakx-2b26ee7be0a60371a187a1c8ec9fc5f7236b156f.zip
- fix wrong dates in the NEWS file
- add logging to dropbear - make sure /dev/pts is mounted (mga#1023) - make root user homedir /root - add agetty (mga#2052)
-rw-r--r--rescue/NEWS13
-rw-r--r--rescue/list.xml2
-rwxr-xr-xrescue/startssh7
-rw-r--r--rescue/tree/etc/passwd2
4 files changed, 18 insertions, 6 deletions
diff --git a/rescue/NEWS b/rescue/NEWS
index e333196bf..71f2324cd 100644
--- a/rescue/NEWS
+++ b/rescue/NEWS
@@ -1,9 +1,16 @@
-Version 1.30 - 26 January 2011, by Thierry Vignaud
+Version 1.31 - 25 Februari 2012, by Maarten Vanraes (AL13N)
+
+- add logging to dropbear
+- make sure /dev/pts is mounted (mga#1023)
+- make root user homedir /root
+- add agetty (mga#2052)
+
+Version 1.30 - 26 January 2012, by Thierry Vignaud
- enable autologin on all consoles
- include mkfs.nilfs2 & nilfs-tune
-Version 1.29 - 25 January 2011, by Thierry Vignaud
+Version 1.29 - 25 January 2012, by Thierry Vignaud
- drop support for squashfs3
- enable rescue through serial line (mga#2052)
@@ -15,7 +22,7 @@ Version 1.29 - 25 January 2011, by Thierry Vignaud
- only consider fstab from the selected fs
- switch to udev
-Version 1.28 - 15 January 2011, by Thierry Vignaud
+Version 1.28 - 15 January 2012, by Thierry Vignaud
- use init from drakx-installer-sysvinit instead of system one
diff --git a/rescue/list.xml b/rescue/list.xml
index 8317e26c7..0b50d80eb 100644
--- a/rescue/list.xml
+++ b/rescue/list.xml
@@ -43,7 +43,7 @@
losetup
ldconfig
- mingetty
+ mingetty agetty
reboot halt shutdown
kill killall5 ps strace
sed tr
diff --git a/rescue/startssh b/rescue/startssh
index 4c585bc7f..19795aaa1 100755
--- a/rescue/startssh
+++ b/rescue/startssh
@@ -7,12 +7,17 @@ if (( $? != 0 )); then
exit $?
fi
+# change passwd file
sed -E -i -e 's/^root:[^:]*:/root:'"$passwd"':/' /etc/passwd
+# dropbear must have /dev/pts mounted
+grep '^devpts /dev/pts devpts ' /proc/mounts >/dev/null 2>/dev/null || mount -t devpts devpts /dev/pts
+
+# generate host keys
mkdir -p /etc/dropbear
[[ -f /etc/dropbear/dropbear_dss_host_key ]] || dropbearkey -t dss -f /etc/dropbear/dropbear_dss_host_key >/dev/null
[[ -f /etc/dropbear/dropbear_rsa_host_key ]] || dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key >/dev/null
echo ""
echo -n "Starting ssh daemon... "
-dropbear && echo "OK"
+dropbear -E 2>/var/log/dropbear.log && echo "OK"
diff --git a/rescue/tree/etc/passwd b/rescue/tree/etc/passwd
index 568451e4e..3a1254f77 100644
--- a/rescue/tree/etc/passwd
+++ b/rescue/tree/etc/passwd
@@ -1,3 +1,3 @@
-root::0:0::/:/bin/bash
+root::0:0::/root:/bin/bash
shutdown:*:6:0:shutdown:/sbin:/sbin/shutdown
halt:*:7:0:halt:/sbin:/sbin/halt