This commit was manufactured by cvs2git to create branch 'AC-branch'.

Cherrypick from master 2007-10-16 16:27:36 UTC Elan Ruusamäe <glen@pld-linux.org> '- typo':
    geninitrd-ac.patch -> 1.3
    geninitrd-typo.patch -> 1.1

diff --git a/geninitrd-ac.patch b/geninitrd-ac.patch
new file mode 100644 (file)
index 0000000..2be7d6d
--- /dev/null
+++ b/geninitrd-ac.patch
@@ -0,0 +1,16 @@
+--- geninitrd-8202.orig/geninitrd      2007-01-27 19:35:18.000000000 +0100
++++ geninitrd-8202/geninitrd   2007-02-05 11:31:33.000000000 +0100
+@@ -934,12 +934,7 @@
+ 
+ if [ "x" = "x$INITRDFS" ] ; then
+       if [ "x" = "x$FS" ] ; then
+-              # default value
+-              if [ "$pack_version" -ge "002005" ] ; then
+-                      INITRDFS="initramfs"
+-              else
+-                      INITRDFS="rom"
+-              fi
++              INITRDFS="rom"
+       else
+               echo >&2 "Warning: FS configuration options is obsoleted. Use INITRDFS instead"
+               INITRDFS="$FS"

diff --git a/geninitrd-typo.patch b/geninitrd-typo.patch
new file mode 100644 (file)
index 0000000..62ac1e2
--- /dev/null
+++ b/geninitrd-typo.patch
@@ -0,0 +1,11 @@
+--- geninitrd-8812/geninitrd~  2007-10-16 19:24:10.000000000 +0300
++++ geninitrd-8812/geninitrd   2007-10-16 19:24:46.626610800 +0300
+@@ -96,7 +96,7 @@
+ 
+ # aborts program abnormally
+ die() {
+-      local rc={$2:-1}
++      local rc=${2:-1}
+       echo >&2 "$PROGRAM: ERROR: $1"
+       exit $rc
+ }