From 754282e93e9d349e74d1477602321c402d9af67a Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Thu, 19 Apr 2012 08:58:40 +0000 Subject: [PATCH] - obsolete --- ...pts-skip_networkmanager_users_config.patch | 62 ------------------- rc-scripts-svn.patch | 59 ------------------ 2 files changed, 121 deletions(-) delete mode 100644 rc-scripts-skip_networkmanager_users_config.patch delete mode 100644 rc-scripts-svn.patch diff --git a/rc-scripts-skip_networkmanager_users_config.patch b/rc-scripts-skip_networkmanager_users_config.patch deleted file mode 100644 index e81710b..0000000 --- a/rc-scripts-skip_networkmanager_users_config.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- rc-scripts-0.4.5.2/rc.d/init.d/network.orig 2011-12-14 12:23:30.000000000 +0100 -+++ rc-scripts-0.4.5.2/rc.d/init.d/network 2012-01-25 10:37:12.670299072 +0100 -@@ -135,7 +135,8 @@ - case $i in - *ifcfg-lo) continue ;; - esac -- ONBOOT=""; . "$i" 2>/dev/null -+ ONBOOT=""; USERS=""; . "$i" 2>/dev/null -+ [ ${USERS:-no} != no ] && continue - [ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}" - done - ` -@@ -145,7 +146,8 @@ - case ${i##*/} in - ifcfg-lo|ifcfg-sit*|ifcfg-atm*|ifcfg-lec*|ifcfg-nas*|ifcfg-br*|ifcfg-*.*) continue ;; - esac -- ONBOOT=""; . "$i" 2>/dev/null -+ ONBOOT=""; USERS=""; . "$i" 2>/dev/null -+ [ ${USERS:-no} != no ] && continue - [ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}" - done - ` -@@ -156,7 +158,8 @@ - ifcfg-*.*) ;; - *) continue ;; - esac -- ONBOOT=""; . "$i" 2>/dev/null -+ ONBOOT=""; USERS=""; . "$i" 2>/dev/null -+ [ ${USERS:-no} != no ] && continue - [ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}" - done - ` -@@ -167,7 +170,8 @@ - ifcfg-br*) ;; - *) continue ;; - esac -- ONBOOT=""; . "$i" 2>/dev/null -+ ONBOOT=""; USERS=""; . "$i" 2>/dev/null -+ [ ${USERS:-no} != no ] && continue - [ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}" - done - ` -@@ -178,7 +182,8 @@ - ifcfg-sit*) ;; - *) continue ;; - esac -- ONBOOT=""; . "$i" 2>/dev/null -+ ONBOOT=""; USERS=""; . "$i" 2>/dev/null -+ [ ${USERS:-no} != no ] && continue - [ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}" - done - ` -@@ -186,7 +191,8 @@ - - tunnels=$( - for i in $(network_interface_configs 'tnlcfg-*'); do -- ONBOOT=""; . "$i" 2>/dev/null -+ ONBOOT=""; USERS=""; . "$i" 2>/dev/null -+ [ ${USERS:-no} != no ] && continue - [ ${ONBOOT:-no} = yes ] && echo "${i##*/tnlcfg-}" - done - ) diff --git a/rc-scripts-svn.patch b/rc-scripts-svn.patch deleted file mode 100644 index 47ffc74..0000000 --- a/rc-scripts-svn.patch +++ /dev/null @@ -1,59 +0,0 @@ -Index: rc.d/rc.sysinit -=================================================================== ---- rc.d/rc.sysinit (wersja 12481) -+++ rc.d/rc.sysinit (wersja 12485) -@@ -570,6 +570,10 @@ - # Load modules - if ! use_upstart; then - load_kernel_modules modules -+ for f in /etc/modules-load.d/*.conf ; do -+ [ -r $f ] || continue -+ load_kernel_modules ${f##/etc/} -+ done - fi - - if [ -x /sbin/multipath ] && ! is_no "$DM_MULTIPATH"; then -Index: service -=================================================================== ---- service (wersja 12481) -+++ service (wersja 12485) -@@ -85,6 +85,14 @@ - echo "${VERSION}" >&2 - exit 0 - ;; -+ --ignore-dependencies) -+ export SYSTEMCTL_IGNORE_DEPENDENCIES=1 -+ shift -+ ;; -+ --skip-redirect) -+ export SYSTEMCTL_SKIP_REDIRECT=1 -+ shift -+ ;; - --upstart) - USE_UPSTART=yes - shift -@@ -116,7 +124,10 @@ - esac - done - --if [ -x "${SERVICEDIR}/${SERVICE}" ]; then -+if [ -x /bin/systemd_booted ] && /bin/systemd_booted && /bin/systemctl status ${SERVICE}.service > /dev/null 2>&1; then -+ echo >&2 "Redirecting to /bin/systemctl ${OPTIONS} ${SERVICE}.service" -+ exec /bin/systemctl ${ACTION} ${SERVICE}.service ${OPTIONS} -+elif [ -x "${SERVICEDIR}/${SERVICE}" ]; then - exec env -i USE_UPSTART=$USE_UPSTART LANG=$LANG PATH=$PATH TERM=$TERM "${SERVICEDIR}/${SERVICE}" ${ACTION} ${OPTIONS} - else - echo "${SERVICE}: unrecognized service" >&2 -Index: rc.d/rc.sysinit -=================================================================== ---- rc.d/rc.sysinit (wersja 12506) -+++ rc.d/rc.sysinit (kopia robocza) -@@ -173,7 +173,7 @@ - fi - - # we need /proc mounted before everything -- is_fsmounted proc /proc || mount -n -o gid=17 -t proc /proc /proc -+ is_fsmounted proc /proc || mount -n /proc || mount -n -o gid=17,hidepid=2 -t proc /proc /proc - - # Only read this once. - cmdline=$(cat /proc/cmdline) -- 2.37.3