summaryrefslogtreecommitdiffstats
path: root/live/One/2006.0/patches
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-04-25 12:26:16 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-04-25 12:26:16 +0000
commit126777bc019a54afb4ec51299f2cf9d2841698aa (patch)
tree97f76e571902ead55ba138f1156a4b4f00b9b779 /live/One/2006.0/patches
parentf1f67448efc714873378dfeb8279fae68054a90a (diff)
downloaddrakx-126777bc019a54afb4ec51299f2cf9d2841698aa.tar
drakx-126777bc019a54afb4ec51299f2cf9d2841698aa.tar.gz
drakx-126777bc019a54afb4ec51299f2cf9d2841698aa.tar.bz2
drakx-126777bc019a54afb4ec51299f2cf9d2841698aa.tar.xz
drakx-126777bc019a54afb4ec51299f2cf9d2841698aa.zip
re-sync after the big svn loss
Diffstat (limited to 'live/One/2006.0/patches')
-rw-r--r--live/One/2006.0/patches/Cards+.legacy.patch20
-rw-r--r--live/One/2006.0/patches/halt.loopfs.patch20
-rw-r--r--live/One/2006.0/patches/lp.script.start.patch11
-rw-r--r--live/One/2006.0/patches/netfs.loopfs.patch11
4 files changed, 0 insertions, 62 deletions
diff --git a/live/One/2006.0/patches/Cards+.legacy.patch b/live/One/2006.0/patches/Cards+.legacy.patch
deleted file mode 100644
index 12316bc47..000000000
--- a/live/One/2006.0/patches/Cards+.legacy.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- usr/share/ldetect-lst/Cards+.legacy 2006-03-07 12:42:06.000000000 -0500
-+++ usr/share/ldetect-lst/Cards+ 2006-03-07 12:42:40.000000000 -0500
-@@ -1931,7 +1931,7 @@
- SEE NVIDIA Legacy
-
- NAME NVIDIA GeForce3 (generic)
--SEE NVIDIA GeForce
-+SEE NVIDIA Legacy
-
- NAME NVIDIA GeForce3 (xbox)
- DRIVER nvxbox
-@@ -1939,7 +1939,7 @@
- LINE Option "HWCursor" "0"
-
- NAME NVIDIA GeForce4 (generic)
--SEE NVIDIA GeForce
-+SEE NVIDIA Legacy
-
- NAME NVIDIA GeForce FX (generic)
- SEE NVIDIA GeForce
diff --git a/live/One/2006.0/patches/halt.loopfs.patch b/live/One/2006.0/patches/halt.loopfs.patch
deleted file mode 100644
index 2ea4829a6..000000000
--- a/live/One/2006.0/patches/halt.loopfs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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/lp.script.start.patch b/live/One/2006.0/patches/lp.script.start.patch
deleted file mode 100644
index 6a2b36b23..000000000
--- a/live/One/2006.0/patches/lp.script.start.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- etc/dynamic/scripts/lp.script.start 2006-03-03 10:15:52.000000000 -0500
-+++ etc/dynamic/scripts/lp.script 2006-03-03 10:59:14.000000000 -0500
-@@ -78,6 +78,8 @@
- # not already running
- ps auxwww | grep 'perl /usr/sbin/autosetupprintqueues' | grep -vq grep && return
- ps auxwww | grep 'perl /usr/sbin/printerdrake' | grep -vq grep && return
-+ chkconfig --add cups
-+ service cups status >/dev/null || service cups start
- autosetupprintqueues --$AUTO_SETUP_QUEUES_MODE &
- fi
- fi
diff --git a/live/One/2006.0/patches/netfs.loopfs.patch b/live/One/2006.0/patches/netfs.loopfs.patch
deleted file mode 100644
index a2b32902a..000000000
--- a/live/One/2006.0/patches/netfs.loopfs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 ]