[or-cvs] r16197: Removed unecessary fsscript patches and fixed rejects in som (incognito/trunk/root_overlay/var/patches)
anonym at seul.org
anonym at seul.org
Fri Jul 25 14:01:48 UTC 2008
Author: anonym
Date: 2008-07-25 10:01:48 -0400 (Fri, 25 Jul 2008)
New Revision: 16197
Removed:
incognito/trunk/root_overlay/var/patches/NetworkManagerDispatcher.patch
Modified:
incognito/trunk/root_overlay/var/patches/mkxf86config.sh.patch
incognito/trunk/root_overlay/var/patches/secure_halt.patch
incognito/trunk/root_overlay/var/patches/xorg.conf.in.patch
Log:
Removed unecessary fsscript patches and fixed rejects in some others. Formated output of secure halt.
Deleted: incognito/trunk/root_overlay/var/patches/NetworkManagerDispatcher.patch
===================================================================
--- incognito/trunk/root_overlay/var/patches/NetworkManagerDispatcher.patch 2008-07-25 13:59:45 UTC (rev 16196)
+++ incognito/trunk/root_overlay/var/patches/NetworkManagerDispatcher.patch 2008-07-25 14:01:48 UTC (rev 16197)
@@ -1,52 +0,0 @@
---- etc/init.d/NetworkManager.orig 2007-09-03 08:13:10.000000000 -0500
-+++ etc/init.d/NetworkManager 2007-09-03 15:27:21.000000000 -0500
-@@ -18,6 +18,7 @@
- sbindir=${exec_prefix}/sbin
-
- NETWORKMANAGER_BIN=${sbindir}/NetworkManager
-+NETWORKMANAGERDISP_BIN=${sbindir}/NetworkManagerDispatcher
-
- # Sanity checks.
- [ -x $NETWORKMANAGER_BIN ] || exit 0
-@@ -28,6 +29,7 @@
- # so we can rearrange this easily
- processname=$NETWORKMANAGER_BIN
- pidfile=/var/run/NetworkManager.pid
-+disppidfile=/var/run/NetworkManagerDispatcher.pid
-
- depend() {
- need dhcdbd hald
-@@ -42,6 +44,16 @@
- start-stop-daemon --start --quiet --exec ${processname}
- eend $?
- echo $(/bin/pidof NetworkManager) > ${pidfile}
-+
-+
-+ if [ -x ${NETWORKMANAGERDISP_BIN} ]; then
-+ ebegin "Starting NetworkManagerDispatcher"
-+ start-stop-daemon --start --quiet --exec ${NETWORKMANAGERDISP_BIN}
-+ eend $?
-+ echo $(/bin/pidof NetworkManagerDispatcher) > ${disppidfile}
-+ fi
-+
-+
- }
-
- stop()
-@@ -52,4 +64,16 @@
- if [ -e ${pidfile} ]; then
- rm -f $pidfile
- fi
-+
-+
-+ if [ -e ${disppidfile} ]; then
-+ ebegin "Stopping NetworkManagerDispatcher"
-+ start-stop-daemon --stop --quiet --exec ${NETWORKMANAGERDISP_BIN} --pidfile ${disppidfile}
-+ eend $?
-+ if [ -e ${disppidfile} ]; then
-+ rm -f $disppidfile
-+ fi
-+ fi
-+
-+
- }
Modified: incognito/trunk/root_overlay/var/patches/mkxf86config.sh.patch
===================================================================
--- incognito/trunk/root_overlay/var/patches/mkxf86config.sh.patch 2008-07-25 13:59:45 UTC (rev 16196)
+++ incognito/trunk/root_overlay/var/patches/mkxf86config.sh.patch 2008-07-25 14:01:48 UTC (rev 16197)
@@ -1,5 +1,5 @@
---- usr/sbin/mkxf86config.sh.orig 2007-05-24 15:25:55.000000000 -0500
-+++ usr/sbin/mkxf86config.sh 2007-06-01 07:03:47.000000000 -0500
+--- usr/sbin/mkxf86config.sh.orig 2008-07-20 15:54:11.000000000 +0200
++++ usr/sbin/mkxf86config.sh 2008-07-20 15:53:53.000000000 +0200
@@ -98,6 +98,16 @@
esac
fi
@@ -17,8 +17,8 @@
# We used to use ddcxinfo-knoppix for monitor information, now we will just let
# X choose for itself. This will probably break older machines.
# You can uncomment the following to re-enable dccxinfo-knoppix, but this only
-@@ -250,7 +260,7 @@
- -e 's|@@XMODULE@@|'"${XMODULE}"'|g;'"${VMWARE}""${VPC}""${SERIALMOUSE}""${USBMOUSE}""${PSMOUSE}""${SWCURSOR}""${WHEEL}""${SYNMOUSE}""${MOUSEDRIVER}" \
+@@ -258,7 +268,7 @@
+ -e 's|@@XMODULE@@|'"${XMODULE}"'|g;'"${VMWARE}""${VPC}""${SERIALMOUSE}""${USBMOUSE}""${PSMOUSE}""${SWCURSOR}""${MONITORLAYOUT}""${WHEEL}""${SYNMOUSE}""${MOUSEDRIVER}" \
-e 's|@@SYNDEV@@|'"${SYNDEV}"'|g' \
-e 's|@@MODES@@|'"${MODES}"'|g;'"${DEPTH}" \
- -e 's|"XkbLayout" *"[^"]*"|"XkbLayout" "'"${XKEYBOARD}"'"|g;'"${DEADKEYS}" \
Modified: incognito/trunk/root_overlay/var/patches/secure_halt.patch
===================================================================
--- incognito/trunk/root_overlay/var/patches/secure_halt.patch 2008-07-25 13:59:45 UTC (rev 16196)
+++ incognito/trunk/root_overlay/var/patches/secure_halt.patch 2008-07-25 14:01:48 UTC (rev 16197)
@@ -1,5 +1,5 @@
---- etc/init.d/halt.sh.orig 2008-01-11 07:21:49.000000000 +0100
-+++ etc/init.d/halt.sh 2008-01-11 08:13:49.000000000 +0100
+--- etc/init.d/halt.sh.orig 2008-07-22 01:18:46.000000000 +0200
++++ etc/init.d/halt.sh 2008-07-22 01:19:32.000000000 +0200
@@ -35,6 +35,18 @@
ebegin $"Deactivating swap"
swapoff -a
@@ -19,7 +19,7 @@
fi
# Write a reboot record to /var/log/wtmp before unmounting
-@@ -184,6 +196,29 @@
+@@ -184,6 +196,32 @@
fi
fi
eend ${mount_worked}
@@ -37,7 +37,10 @@
+# secure deletion of system memory
+splash_verbose
+clear
-+einfo "You may remove the CD now and leave. The machine will shutdown when complete with securely ereasing the memory which otherwise could leave traces. If this is of no worry, the machine can safely be turned off manually now."
++einfo "You may now remove the CD or USB memory stick you run Incognito from and leave."
++einfo "The machine will shutdown automatically when complete with securely ereasing the"
++einfo "system memory which otherwise could leave traces. If you are not worried about"
++einfo "this the machine can be turned off manually now."
+einfo " "
+ebegin "Erasing memory"
+/usr/bin/smem >/dev/null
Modified: incognito/trunk/root_overlay/var/patches/xorg.conf.in.patch
===================================================================
--- incognito/trunk/root_overlay/var/patches/xorg.conf.in.patch 2008-07-25 13:59:45 UTC (rev 16196)
+++ incognito/trunk/root_overlay/var/patches/xorg.conf.in.patch 2008-07-25 14:01:48 UTC (rev 16197)
@@ -1,5 +1,5 @@
---- etc/X11/xorg.conf.in.orig 2007-09-19 10:38:43.000000000 -0500
-+++ etc/X11/xorg.conf.in 2007-09-20 10:55:46.000000000 -0500
+--- etc/X11/xorg.conf.in.orig 2008-07-20 15:41:23.000000000 +0200
++++ etc/X11/xorg.conf.in 2008-07-20 15:49:55.000000000 +0200
@@ -1,6 +1,7 @@
Section "ServerLayout"
- Identifier "X.Org Configured"
@@ -17,7 +17,7 @@
Option "XkbModel" "pc105"
# Option "XkbOptions" "grp:toggle,grp_led:scroll"
Option "XkbVariant" ",winkeys"
-@@ -163,6 +165,11 @@
+@@ -164,6 +166,11 @@
# BusID "PCI:1:0:0"
EndSection
@@ -29,7 +29,7 @@
Section "Screen"
Identifier "Screen0"
Device "Card0"
-@@ -198,6 +205,41 @@
+@@ -199,6 +206,41 @@
EndSubSection
EndSection
More information about the tor-commits
mailing list