summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-10-20 18:14:41 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-10-20 18:14:41 +0000
commit4e42e65e5bb0837e507504d1792387a5b0f52383 (patch)
tree48cb2f688ea42917cb47a858eac0db07eef0682e
parentc98d7b8b2de6808503ced96544c521fc25c2dd6a (diff)
downloaddrakx-4e42e65e5bb0837e507504d1792387a5b0f52383.tar
drakx-4e42e65e5bb0837e507504d1792387a5b0f52383.tar.gz
drakx-4e42e65e5bb0837e507504d1792387a5b0f52383.tar.bz2
drakx-4e42e65e5bb0837e507504d1792387a5b0f52383.tar.xz
drakx-4e42e65e5bb0837e507504d1792387a5b0f52383.zip
reboot if things went nicely
-rwxr-xr-xrescue/make_rescue_img4
-rwxr-xr-xrescue/partimage_whole_disk5
2 files changed, 5 insertions, 4 deletions
diff --git a/rescue/make_rescue_img b/rescue/make_rescue_img
index ef2f37215..bd4778523 100755
--- a/rescue/make_rescue_img
+++ b/rescue/make_rescue_img
@@ -92,8 +92,6 @@ if ($ENV{PARTIMAGE_RPM}) {
$_ = <<EOF if /^\s*rescue-gui/;
if grep -q save_all /proc/cmdline; then
drvinst NETWORK ; dhcp-client ; partimage_whole_disk -s $server save_all $default_dir
- echo "Press enter"
- read
fi
if grep -q rest_all /proc/cmdline; then
if [ -d $local_dir ]; then
@@ -101,8 +99,6 @@ if ($ENV{PARTIMAGE_RPM}) {
else
drvinst NETWORK ; dhcp-client ; partimage_whole_disk -s $server rest_all $partimage_dir
fi
- echo "Press enter"
- read
fi
EOF
} "$tmp/etc/rc.sysinit";
diff --git a/rescue/partimage_whole_disk b/rescue/partimage_whole_disk
index 3649c70f1..c332df838 100755
--- a/rescue/partimage_whole_disk
+++ b/rescue/partimage_whole_disk
@@ -215,6 +215,11 @@ sub rest_all {
}
run_or_die('install_bootloader', '--auto');
+
+ print "\n", "Your system is ready, press enter to reboot (Y/n) ";
+ if (<STDIN> !~ /n/i) {
+ run_program::run('reboot');
+ }
}
sub lst_fields() { qw(device size fs_type saved) }