summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-04-03 14:57:09 +0000
committerThierry Vignaud <tv@mandriva.org>2009-04-03 14:57:09 +0000
commit0c9dc2c3127779bbe3372c7960b706bb091be51f (patch)
tree72373599e73b174067a7fb342891b02607691bc1
parentbd3e0e17c383835f099d640e2c566bf5b184c115 (diff)
downloaddrakx-0c9dc2c3127779bbe3372c7960b706bb091be51f.tar
drakx-0c9dc2c3127779bbe3372c7960b706bb091be51f.tar.gz
drakx-0c9dc2c3127779bbe3372c7960b706bb091be51f.tar.bz2
drakx-0c9dc2c3127779bbe3372c7960b706bb091be51f.tar.xz
drakx-0c9dc2c3127779bbe3372c7960b706bb091be51f.zip
pass --restore instead of restore option (reverting r252991 from
2009-02-18: "pass --restore instead of restore option")
-rw-r--r--images/NEWS1
-rwxr-xr-ximages/make_boot_img2
2 files changed, 2 insertions, 1 deletions
diff --git a/images/NEWS b/images/NEWS
index 539c0cf22..f00ca4acb 100644
--- a/images/NEWS
+++ b/images/NEWS
@@ -1,4 +1,5 @@
- include firmwares for most common network cards (#49195)
+- pass --restore instead of restore option
Version 1.37 - 3 April 2009, by Pascal Terjan
diff --git a/images/make_boot_img b/images/make_boot_img
index 48a415584..cb4dcfab9 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -223,7 +223,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]) } }