summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnne Nicolas <ennael@mageia.org>2011-03-03 14:51:04 +0000
committerAnne Nicolas <ennael@mageia.org>2011-03-03 14:51:04 +0000
commit6f476a629c0d6ef233fed1c2e47f19f559ec0bce (patch)
tree0d97d83c6755e81dc25036da3b14625c4cd410b9
parente9d4d7eb4a934587eafd5f491ad2f62bb04b5258 (diff)
downloaddrakx-6f476a629c0d6ef233fed1c2e47f19f559ec0bce.tar
drakx-6f476a629c0d6ef233fed1c2e47f19f559ec0bce.tar.gz
drakx-6f476a629c0d6ef233fed1c2e47f19f559ec0bce.tar.bz2
drakx-6f476a629c0d6ef233fed1c2e47f19f559ec0bce.tar.xz
drakx-6f476a629c0d6ef233fed1c2e47f19f559ec0bce.zip
remove -e wich break firmware load (thanks aginies)
-rwxr-xr-ximages/make_boot_img2
-rw-r--r--rescue/Makefile2
-rw-r--r--rescue/NEWS3
3 files changed, 5 insertions, 2 deletions
diff --git a/images/make_boot_img b/images/make_boot_img
index 81b2d6429..28ca8eab7 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -165,7 +165,7 @@ sub initrd {
_ "cp -a $firm $tmp_initrd/$dest";
};
- output("$tmp_initrd/hotplug", q{#!/bin/sh -e
+ output("$tmp_initrd/hotplug", q{#!/bin/sh
if [ "$SUBSYSTEM" = firmware ] && [ "$ACTION" = add ] && [ -n "$FIRMWARE" ] ; then
if [ ! -e /sys$DEVPATH/loading ]; then
exit 1
diff --git a/rescue/Makefile b/rescue/Makefile
index cbc1a981b..4a6edd9e9 100644
--- a/rescue/Makefile
+++ b/rescue/Makefile
@@ -1,6 +1,6 @@
include ../Makefile.config
-VERSION=1.21
+VERSION=1.22
PRODUCT=drakx-installer-rescue
RESCUE = rescue.sqfs
diff --git a/rescue/NEWS b/rescue/NEWS
index 078c48ef2..557db4c4e 100644
--- a/rescue/NEWS
+++ b/rescue/NEWS
@@ -1,3 +1,6 @@
+Version 1.22 - 24 February 2011, by Pascal "pterjan" Terjan
+
+- cleaning for Mageia import
- include /etc/netconfig (needed by mount.nfs)
Version 1.18 - 13 April 2010, by Olivier "blino" Blin