diff options
| author | Olivier Blin <oblin@mandriva.org> | 2006-02-23 11:15:41 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2006-02-23 11:15:41 +0000 |
| commit | 75eedf36f7b2685f752ba4908478c4b0f7a872bd (patch) | |
| tree | 0043bcf6eaa62d33723d33ccda4accf2f57d362c /live/One/2006.0/patches | |
| parent | 4ce4095ffa480d6b68f38035bce2efa86905d1aa (diff) | |
| download | drakx-75eedf36f7b2685f752ba4908478c4b0f7a872bd.tar drakx-75eedf36f7b2685f752ba4908478c4b0f7a872bd.tar.gz drakx-75eedf36f7b2685f752ba4908478c4b0f7a872bd.tar.bz2 drakx-75eedf36f7b2685f752ba4908478c4b0f7a872bd.tar.xz drakx-75eedf36f7b2685f752ba4908478c4b0f7a872bd.zip | |
initial import of Mandriva One configuration files and draklive-install tool
Diffstat (limited to 'live/One/2006.0/patches')
| -rw-r--r-- | live/One/2006.0/patches/halt.loopfs.patch | 20 | ||||
| -rw-r--r-- | live/One/2006.0/patches/netfs.loopfs.patch | 11 |
2 files changed, 31 insertions, 0 deletions
diff --git a/live/One/2006.0/patches/halt.loopfs.patch b/live/One/2006.0/patches/halt.loopfs.patch new file mode 100644 index 000000000..2ea4829a6 --- /dev/null +++ b/live/One/2006.0/patches/halt.loopfs.patch @@ -0,0 +1,20 @@ +--- etc/init.d/halt.loopfs 2005-12-27 22:13:48.000000000 +0100 ++++ etc/init.d/halt 2005-12-27 22:14:28.000000000 +0100 +@@ -23,7 +23,7 @@ + } + + halt_get_remaining() { +- awk '$2 ~ /^\/$|^\/proc|^\/sys|^\/dev/{next} ++ awk '$2 ~ /^\/$|^\/proc|^\/sys|^\/dev|^\/live/{next} + $3 == "tmpfs" || $3 == "proc" {print $2 ; next} + /(^#|loopfs|autofs|devfs|^none|^\/dev\/ram|^\/dev\/root)/ {next} + {print $2}' /proc/mounts +@@ -139,7 +139,7 @@ + # Unmount loopback stuff first + remaining=`awk '!/^#/ && $1 ~ /^\/dev\/loop/ && $2 != "/" {print $2}' /proc/mounts` + devremaining=`awk '!/^#/ && $1 ~ /^\/dev\/loop/ && $2 != "/" {print $1}' /proc/mounts` +-[ -n "$remaining" ] && { ++/bin/false && [ -n "$remaining" ] && { + sig= + retry=3 + while [ -n "$remaining" -a "$retry" -gt 0 ] diff --git a/live/One/2006.0/patches/netfs.loopfs.patch b/live/One/2006.0/patches/netfs.loopfs.patch new file mode 100644 index 000000000..a2b32902a --- /dev/null +++ b/live/One/2006.0/patches/netfs.loopfs.patch @@ -0,0 +1,11 @@ +--- etc/init.d/netfs.loopfs 2005-09-19 17:34:31.000000000 +0200 ++++ etc/init.d/netfs 2005-12-27 19:23:39.000000000 +0100 +@@ -50,7 +50,7 @@ + # Unmount loopback stuff first + remaining=`LC_ALL=C awk '!/^#/ && $1 ~ /^\/dev\/loop/ && $2 != "/" {print $2}' /proc/mounts` + devremaining=`LC_ALL=C awk '!/^#/ && $1 ~ /^\/dev\/loop/ && $2 != "/" {print $1}' /proc/mounts` +- [ -n "$remaining" ] && { ++ /bin/false && [ -n "$remaining" ] && { + sig= + retry=3 + while [ -n "$remaining" -a "$retry" -gt 0 ] |