From 4dd3873a2a6e7305a35ca6c50811937e693d3a97 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sun, 19 Sep 2010 16:12:10 +0200 Subject: initscripts : moved unused files to obsolete dir Signed-off-by: Frans Meulenbroeks --- .../initscripts-1.0/slugos/devices.patch | 52 ---------------------- .../initscripts-1.0/slugos/rootopts.patch | 15 ------- .../initscripts-1.0/slugos/devices.patch | 52 ++++++++++++++++++++++ .../initscripts-1.0/slugos/rootopts.patch | 15 +++++++ 4 files changed, 67 insertions(+), 67 deletions(-) delete mode 100644 recipes/initscripts/initscripts-1.0/slugos/devices.patch delete mode 100644 recipes/initscripts/initscripts-1.0/slugos/rootopts.patch create mode 100644 recipes/obsolete/initscripts/initscripts-1.0/slugos/devices.patch create mode 100644 recipes/obsolete/initscripts/initscripts-1.0/slugos/rootopts.patch diff --git a/recipes/initscripts/initscripts-1.0/slugos/devices.patch b/recipes/initscripts/initscripts-1.0/slugos/devices.patch deleted file mode 100644 index 2583b62f48..0000000000 --- a/recipes/initscripts/initscripts-1.0/slugos/devices.patch +++ /dev/null @@ -1,52 +0,0 @@ -# -# Patch to allow /dev to reside permanently in the file -# system. -# ---- old/devices 2005-05-28 21:51:39.012078699 -0700 -+++ new/devices 2005-06-12 00:16:29.222686303 -0700 -@@ -6,7 +6,7 @@ - . /etc/default/rcS - - # exit without doing anything if udev is active --if test -e /dev/.udev -o -e /dev/.udevdb; then -+if test -e /dev/.udev -o -e /dev/.udevdb -o -e /dev/.permanent; then - exit 0 - fi - -@@ -37,12 +37,20 @@ - mknod /dev/ppp c 108 0 - if test "$VERBOSE" != "no"; then echo "done"; fi - else -- if test "$VERBOSE" != "no"; then echo -n "Mounting /dev ramdisk: "; fi -- mount -t ramfs ramfs /dev || mount -t tmpfs ramfs /dev -- if test $? -ne 0; then -- if test "$VERBOSE" != "no"; then echo "failed"; fi -+ if test -e /dev/.noram -+ then -+ # There should be no files, any files will damage the -+ # makedevs script below. -+ rm $(find /dev -type f -print) -+ :>/dev/.noram - else -- if test "$VERBOSE" != "no"; then echo "done"; fi -+ if test "$VERBOSE" != "no"; then echo -n "Mounting /dev ramdisk: "; fi -+ mount -t ramfs ramfs /dev || mount -t tmpfs ramfs /dev -+ if test $? -ne 0; then -+ if test "$VERBOSE" != "no"; then echo "failed"; fi -+ else -+ if test "$VERBOSE" != "no"; then echo "done"; fi -+ fi - fi - if test "$VERBOSE" != "no"; then echo -n "Populating /dev: "; fi - cd / -@@ -60,6 +68,10 @@ - if test "$VERBOSE" != "no"; then echo "failed"; fi - else - if test "$VERBOSE" != "no"; then echo "done"; fi -+ if test -e /dev/.noram -+ then -+ :>/dev/.permanent -+ fi - fi - fi - diff --git a/recipes/initscripts/initscripts-1.0/slugos/rootopts.patch b/recipes/initscripts/initscripts-1.0/slugos/rootopts.patch deleted file mode 100644 index 3f2a925879..0000000000 --- a/recipes/initscripts/initscripts-1.0/slugos/rootopts.patch +++ /dev/null @@ -1,15 +0,0 @@ -# -# Ensure that the root file system is remounted with the correct -# options from fstab -# ---- old/checkroot.sh 2005-05-28 19:30:55.488975598 -0700 -+++ new/checkroot.sh 2005-05-28 19:31:32.334390450 -0700 -@@ -149,7 +149,7 @@ - # is on a ro fs until the remount succeeded. Then clean up old mtabs - # and finally write the new mtab. - # --mount -n -o remount,$rootmode / -+mount -n -o remount,$rootopts / - if test "$rootmode" = rw - then - if test ! -L /etc/mtab diff --git a/recipes/obsolete/initscripts/initscripts-1.0/slugos/devices.patch b/recipes/obsolete/initscripts/initscripts-1.0/slugos/devices.patch new file mode 100644 index 0000000000..2583b62f48 --- /dev/null +++ b/recipes/obsolete/initscripts/initscripts-1.0/slugos/devices.patch @@ -0,0 +1,52 @@ +# +# Patch to allow /dev to reside permanently in the file +# system. +# +--- old/devices 2005-05-28 21:51:39.012078699 -0700 ++++ new/devices 2005-06-12 00:16:29.222686303 -0700 +@@ -6,7 +6,7 @@ + . /etc/default/rcS + + # exit without doing anything if udev is active +-if test -e /dev/.udev -o -e /dev/.udevdb; then ++if test -e /dev/.udev -o -e /dev/.udevdb -o -e /dev/.permanent; then + exit 0 + fi + +@@ -37,12 +37,20 @@ + mknod /dev/ppp c 108 0 + if test "$VERBOSE" != "no"; then echo "done"; fi + else +- if test "$VERBOSE" != "no"; then echo -n "Mounting /dev ramdisk: "; fi +- mount -t ramfs ramfs /dev || mount -t tmpfs ramfs /dev +- if test $? -ne 0; then +- if test "$VERBOSE" != "no"; then echo "failed"; fi ++ if test -e /dev/.noram ++ then ++ # There should be no files, any files will damage the ++ # makedevs script below. ++ rm $(find /dev -type f -print) ++ :>/dev/.noram + else +- if test "$VERBOSE" != "no"; then echo "done"; fi ++ if test "$VERBOSE" != "no"; then echo -n "Mounting /dev ramdisk: "; fi ++ mount -t ramfs ramfs /dev || mount -t tmpfs ramfs /dev ++ if test $? -ne 0; then ++ if test "$VERBOSE" != "no"; then echo "failed"; fi ++ else ++ if test "$VERBOSE" != "no"; then echo "done"; fi ++ fi + fi + if test "$VERBOSE" != "no"; then echo -n "Populating /dev: "; fi + cd / +@@ -60,6 +68,10 @@ + if test "$VERBOSE" != "no"; then echo "failed"; fi + else + if test "$VERBOSE" != "no"; then echo "done"; fi ++ if test -e /dev/.noram ++ then ++ :>/dev/.permanent ++ fi + fi + fi + diff --git a/recipes/obsolete/initscripts/initscripts-1.0/slugos/rootopts.patch b/recipes/obsolete/initscripts/initscripts-1.0/slugos/rootopts.patch new file mode 100644 index 0000000000..3f2a925879 --- /dev/null +++ b/recipes/obsolete/initscripts/initscripts-1.0/slugos/rootopts.patch @@ -0,0 +1,15 @@ +# +# Ensure that the root file system is remounted with the correct +# options from fstab +# +--- old/checkroot.sh 2005-05-28 19:30:55.488975598 -0700 ++++ new/checkroot.sh 2005-05-28 19:31:32.334390450 -0700 +@@ -149,7 +149,7 @@ + # is on a ro fs until the remount succeeded. Then clean up old mtabs + # and finally write the new mtab. + # +-mount -n -o remount,$rootmode / ++mount -n -o remount,$rootopts / + if test "$rootmode" = rw + then + if test ! -L /etc/mtab -- cgit 1.2.3-korg