summaryrefslogtreecommitdiffstats
path: root/images
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2010-05-27 10:15:28 +0000
committerOlivier Blin <oblin@mandriva.com>2010-05-27 10:15:28 +0000
commitf961e3d995ad2c6c8ea9eb18144bafcc6759bb4e (patch)
tree0ce1acd50d7454da3202eb86fd701e27863d0b02 /images
parenta03c343a1e72458f17a0e0b8c413205b582c9778 (diff)
downloaddrakx-f961e3d995ad2c6c8ea9eb18144bafcc6759bb4e.tar
drakx-f961e3d995ad2c6c8ea9eb18144bafcc6759bb4e.tar.gz
drakx-f961e3d995ad2c6c8ea9eb18144bafcc6759bb4e.tar.bz2
drakx-f961e3d995ad2c6c8ea9eb18144bafcc6759bb4e.tar.xz
drakx-f961e3d995ad2c6c8ea9eb18144bafcc6759bb4e.zip
disable restore option
Diffstat (limited to 'images')
-rw-r--r--images/NEWS2
-rwxr-xr-ximages/make_boot_img2
2 files changed, 3 insertions, 1 deletions
diff --git a/images/NEWS b/images/NEWS
index 0cc541ab2..c96b35ca4 100644
--- a/images/NEWS
+++ b/images/NEWS
@@ -1,3 +1,5 @@
+- disable restore option
+
Version 1.48 - 28 February 2010, by Thierry Vignaud
- handle new SCSI driver: mpt2sas (#57833)
diff --git a/images/make_boot_img b/images/make_boot_img
index 2fc62cfd8..2d70e6483 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -233,7 +233,7 @@ sub entries_append {
my @entries = (
(map { $_->[0] => "$automatic$default_acpi $_->[1]" } group_by2(@simple_entries)),
noacpi => "$automatic$default_vga acpi=off",
- restore => "$automatic$default_vga restore",
+# restore => "$automatic$default_vga restore",
);
map { { label => $_->[0], append => join(' ', grep { $_ } $default_append, $_->[1]) } }