From: Marcin Krol Date: Sun, 1 Apr 2012 21:11:56 +0000 (+0000) Subject: - merged 0.4.5.3 from PLD X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=068040a7ccb6f9951b77f4541af278f87f6c9e45;p=packages%2Frc-scripts.git - merged 0.4.5.3 from PLD --- diff --git a/rc-local.service b/rc-local.service new file mode 100644 index 0000000..233c8fb --- /dev/null +++ b/rc-local.service @@ -0,0 +1,19 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. + +[Unit] +Description=/etc/rc.d/rc.local Compatibility +After=network.target local-fs.target remote-fs.target + +[Service] +Type=forking +ExecStart=/etc/rc.d/init.d/local start +ExecStop=-/bin/rm -f /var/lock/subsys/local +TimeoutSec=0 +StandardOutput=tty +RemainAfterExit=yes +SysVStartPriority=99 diff --git a/rc-scripts-skip_networkmanager_users_config.patch b/rc-scripts-skip_networkmanager_users_config.patch new file mode 100644 index 0000000..e81710b --- /dev/null +++ b/rc-scripts-skip_networkmanager_users_config.patch @@ -0,0 +1,62 @@ +--- 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 new file mode 100644 index 0000000..47ffc74 --- /dev/null +++ b/rc-scripts-svn.patch @@ -0,0 +1,59 @@ +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) diff --git a/rc-scripts-tld.patch b/rc-scripts-tld.patch new file mode 100644 index 0000000..d2b4f90 --- /dev/null +++ b/rc-scripts-tld.patch @@ -0,0 +1,133 @@ +diff -urN rc-scripts-0.4.5.1.pld//inittab rc-scripts-0.4.5.1/inittab +--- rc-scripts-0.4.5.1.pld//inittab 2012-04-01 19:46:54.662913738 +0000 ++++ rc-scripts-0.4.5.1/inittab 2011-10-03 20:39:36.000000000 +0000 +@@ -8,7 +8,7 @@ + # Modified for RHS Linux by Marc Ewing and Donnie Barnes + # + +-# Default runlevel. The runlevels used by PLD Linux are: ++# Default runlevel. The runlevels used by TLD Linux are: + # 0 - halt (Do NOT set initdefault to this) + # 1 - Single user mode + # 2 - Multiuser, without NFS (The same as 3, if you do not have networking) +diff -urN rc-scripts-0.4.5.1.pld//lib/functions rc-scripts-0.4.5.1/lib/functions +--- rc-scripts-0.4.5.1.pld//lib/functions 2012-04-01 19:46:54.331047818 +0000 ++++ rc-scripts-0.4.5.1/lib/functions 2011-10-03 20:39:36.000000000 +0000 +@@ -48,7 +48,7 @@ + CBUSY="$MAGENTA" # BUSY color + CFAIL="$RED" # FAIL and DIED color + CPOWEREDBY="$CYAN" # "Powered by" color +-CPLD="$GREEN" # "PLD Linux Distribution" color ++CTLD="$GREEN" # "TLD Linux Distribution" color + CI="$RED" # Capital I color (press I to enter interactive startup) + CRESMAN="$GREEN" # "Resource Manager" color + CHARS="" # Characters displayed on the beginning of show line +@@ -379,7 +379,7 @@ + nls "Usage: %s" "$*" + } + +-# Some functions to handle PLD Linux-style messages ++# Some functions to handle TLD Linux-style messages + show() { + local text len + +diff -urN rc-scripts-0.4.5.1.pld//po/de.po rc-scripts-0.4.5.1/po/de.po +--- rc-scripts-0.4.5.1.pld//po/de.po 2012-04-01 19:46:54.405047851 +0000 ++++ rc-scripts-0.4.5.1/po/de.po 2011-10-03 20:39:36.000000000 +0000 +@@ -452,7 +452,7 @@ + msgstr "" + + #: .././rc.d/rc.sysinit:227 +-msgid "\t\t\t%sPowered by %sPLD Linux Distribution%s" ++msgid "\t\t\t%sPowered by %sTLD Linux Distribution%s" + msgstr "" + + #: .././rc.d/init.d/netfs:154 +diff -urN rc-scripts-0.4.5.1.pld//po/pl.po rc-scripts-0.4.5.1/po/pl.po +--- rc-scripts-0.4.5.1.pld//po/pl.po 2012-04-01 19:46:54.406047776 +0000 ++++ rc-scripts-0.4.5.1/po/pl.po 2011-10-03 20:39:36.000000000 +0000 +@@ -449,8 +449,8 @@ + msgstr " w cpusecie %s..." + + #: .././rc.d/rc.sysinit:227 +-msgid "\t\t\t%sPowered by %sPLD Linux Distribution%s" +-msgstr "\t\t\t%sNapędzane przez %sPLD Linux Distribution%s" ++msgid "\t\t\t%sPowered by %sTLD Linux Distribution%s" ++msgstr "\t\t\t%sNapędzane przez %sTLD Linux Distribution%s" + + #: .././rc.d/init.d/netfs:154 + msgid "Active NFS mountpoints: " +diff -urN rc-scripts-0.4.5.1.pld//po/rc-scripts.pot rc-scripts-0.4.5.1/po/rc-scripts.pot +--- rc-scripts-0.4.5.1.pld//po/rc-scripts.pot 2012-04-01 19:46:54.407047712 +0000 ++++ rc-scripts-0.4.5.1/po/rc-scripts.pot 2011-10-03 20:39:36.000000000 +0000 +@@ -455,7 +455,7 @@ + msgstr "" + + #: .././rc.d/rc.sysinit:239 +-msgid "\t\t\t%sPowered by %sPLD Linux Distribution%s" ++msgid "\t\t\t%sPowered by %sTLD Linux Distribution%s" + msgstr "" + + #: .././rc.d/init.d/netfs:154 +diff -urN rc-scripts-0.4.5.1.pld//rc.d/rc.sysinit rc-scripts-0.4.5.1/rc.d/rc.sysinit +--- rc-scripts-0.4.5.1.pld//rc.d/rc.sysinit 2012-04-01 19:46:54.442048015 +0000 ++++ rc-scripts-0.4.5.1/rc.d/rc.sysinit 2011-10-03 20:39:36.000000000 +0000 +@@ -186,7 +186,7 @@ + mount -n -o gid=17 -t selinuxfs selinuxfs /selinux + fi + +- # PLD Linux LiveCD support ++ # TLD Linux LiveCD support + if [ -x /etc/rc.d/rc.live ]; then + /etc/rc.d/rc.live + fi +@@ -229,7 +229,7 @@ + + + # Print welcome message +-nls "\t\t\t%sPowered by %sPLD Linux Distribution%s" "$(termput setaf $CPOWEREDBY)" "$(termput setaf $CPLD)" "$(termput op)" ++nls "\t\t\t%sPowered by %sTLD Linux Distribution%s" "$(termput setaf $CPOWEREDBY)" "$(termput setaf $CTLD)" "$(termput op)" + if ! is_no "$RC_PROMPT"; then + nls -n "\t\t Press %sI%s to enter interactive startup" "$(termput setaf $CI)" "$(termput op)" + echo +diff -urN rc-scripts-0.4.5.1.pld//src/setuidgid.c rc-scripts-0.4.5.1/src/setuidgid.c +--- rc-scripts-0.4.5.1.pld//src/setuidgid.c 2012-04-01 19:46:54.204907409 +0000 ++++ rc-scripts-0.4.5.1/src/setuidgid.c 2011-10-03 20:39:36.000000000 +0000 +@@ -47,7 +47,7 @@ + exit(1); + } + void show_version() { +- fprintf(stderr, "%s $Rev: 12308 $ (PLD Linux rc-scripts)\n", progname); ++ fprintf(stderr, "%s $Rev: 12308 $ (TLD Linux rc-scripts)\n", progname); + } + void version() { + show_version(); +diff -urN rc-scripts-0.4.5.1.pld//sysconfig/init-colors rc-scripts-0.4.5.1/sysconfig/init-colors +--- rc-scripts-0.4.5.1.pld//sysconfig/init-colors 2012-04-01 19:46:54.649047787 +0000 ++++ rc-scripts-0.4.5.1/sysconfig/init-colors 2011-10-03 20:39:36.000000000 +0000 +@@ -1,11 +1,11 @@ +-# Default PLD Linux colors. ++# Default TLD Linux colors. + + CBRACKETS="$CYAN" # brackets [ ] color + CDONE="$GREEN" # DONE and WORK color + CBUSY="$MAGENTA" # BUSY color + CFAIL="$RED" # FAIL and DIED color + CPOWEREDBY="$CYAN" # "Powered by" color +-CPLD="$GREEN" # "PLD Linux Distribution" color ++CTLD="$GREEN" # "TLD Linux Distribution" color + CI="$RED" # Capital I color (press I to enter interactive startup) + CRESMAN="$GREEN" # "Resource Manager" color + CHARS="" # Characters displayed on the beginning of show line +diff -urN rc-scripts-0.4.5.1.pld//sysconfig/init-colors.gentoo rc-scripts-0.4.5.1/sysconfig/init-colors.gentoo +--- rc-scripts-0.4.5.1.pld//sysconfig/init-colors.gentoo 2012-04-01 19:46:54.654925316 +0000 ++++ rc-scripts-0.4.5.1/sysconfig/init-colors.gentoo 2011-10-03 20:39:36.000000000 +0000 +@@ -5,7 +5,7 @@ + CBUSY="$MAGENTA $BOLD" # BUSY color + CFAIL="$RED $BOLD" # FAIL and DIED color + CPOWEREDBY="$BLUE $BOLD" # "Powered by" color +-CPLD="$GREEN $BOLD" # "PLD Linux Distribution" color ++CTLD="$GREEN $BOLD" # "TLD Linux Distribution" color + CI="$RED $BOLD" # Capital I color (press I to enter interactive startup) + CRESMAN="$GREEN $BOLD" # "Resource Manager" color + CHARS=" * " # Characters displayed on the beginning of show line diff --git a/rc-scripts.tmpfiles b/rc-scripts.tmpfiles new file mode 100644 index 0000000..187de38 --- /dev/null +++ b/rc-scripts.tmpfiles @@ -0,0 +1 @@ +d /var/run/netreport 0750 root root - diff --git a/sys-chroots.service b/sys-chroots.service new file mode 100644 index 0000000..9ea1c15 --- /dev/null +++ b/sys-chroots.service @@ -0,0 +1,12 @@ +[Unit] +Description=/etc/rc.d/init.d/sys-chroots Compatibility +After=network.target local-fs.target remote-fs.target + +[Service] +Type=forking +ExecStart=/etc/rc.d/init.d/sys-chroots start +ExecStop=/etc/rc.d/init.d/sys-chroots stop +TimeoutSec=0 +StandardOutput=tty +RemainAfterExit=yes +SysVStartPriority=99