From ad6297e2bdb9bf190b8d89f755ea265b21d589cb Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Fri, 12 Jan 2007 09:51:53 +0000 Subject: initscripts: fix populate-volatile.sh file and directory creation - now chmod gets called do set the correct permissions --- packages/initscripts/initscripts-1.0/populate-volatile.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/initscripts/initscripts-1.0') diff --git a/packages/initscripts/initscripts-1.0/populate-volatile.sh b/packages/initscripts/initscripts-1.0/populate-volatile.sh index a60cc0d420..c5692fea7f 100755 --- a/packages/initscripts/initscripts-1.0/populate-volatile.sh +++ b/packages/initscripts/initscripts-1.0/populate-volatile.sh @@ -11,7 +11,7 @@ COREDEF="00_core" create_file() { EXEC=" touch \"$1\"; - chown ${TUSER}.${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1 + chown ${TUSER}.${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1; chmod ${TMODE} $1 || echo \"Failed to set mode -${TMODE}- for -$1-.\" >/dev/tty0 2>&1 " test "$VOLATILE_ENABLE_CACHE" = yes && echo "$EXEC" >> /etc/volatile.cache @@ -26,7 +26,7 @@ create_file() { mk_dir() { EXEC=" mkdir -p \"$1\"; - chown ${TUSER}.${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1 + chown ${TUSER}.${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1; chmod ${TMODE} $1 || echo \"Failed to set mode -${TMODE}- for -$1-.\" >/dev/tty0 2>&1 " test "$VOLATILE_ENABLE_CACHE" = yes && echo "$EXEC" >> /etc/volatile.cache -- cgit v1.2.3 From ccbc3685b5baf90cd59e5eefeccbee784b9967ee Mon Sep 17 00:00:00 2001 From: ccsmart Date: Tue, 16 Jan 2007 21:22:58 +0000 Subject: initscripts: Correct description. Speed enhancement in previous change as side effect of making linksource a non optional field. --- packages/initscripts/initscripts-1.0/volatiles | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/initscripts/initscripts-1.0') diff --git a/packages/initscripts/initscripts-1.0/volatiles b/packages/initscripts/initscripts-1.0/volatiles index 2bc7d82fbd..4320485663 100644 --- a/packages/initscripts/initscripts-1.0/volatiles +++ b/packages/initscripts/initscripts-1.0/volatiles @@ -3,14 +3,14 @@ # # Every line must either be a comment starting with # # or a definition of format: -# [] +# # where the items are separated by whitespace ! # # : d|f|l : (d)irectory|(f)ile|(l)ink # # A linking example: # l root root 0777 /var/test /tmp/testfile -# f root root 0644 /var/test +# f root root 0644 /var/test none # # Understanding links: # When populate-volatile is to verify/create a directory or file, it will first -- cgit v1.2.3 From bed4011543c11c255d4e2ff5219bdf5acd2c1f6b Mon Sep 17 00:00:00 2001 From: ccsmart Date: Tue, 16 Jan 2007 21:37:24 +0000 Subject: initscripts: Comments are for code functionality. --- packages/initscripts/initscripts-1.0/populate-volatile.sh | 1 - 1 file changed, 1 deletion(-) (limited to 'packages/initscripts/initscripts-1.0') diff --git a/packages/initscripts/initscripts-1.0/populate-volatile.sh b/packages/initscripts/initscripts-1.0/populate-volatile.sh index c5692fea7f..3bb3d94de6 100755 --- a/packages/initscripts/initscripts-1.0/populate-volatile.sh +++ b/packages/initscripts/initscripts-1.0/populate-volatile.sh @@ -114,7 +114,6 @@ apply_cfgfile() { cat ${CFGFILE} | grep -v "^#" | \ while read LINE; do - # This is a hell of a lot faster than using cut or awk 5 times eval `echo "$LINE" | sed -n "s/\(.*\)\ \(.*\) \(.*\)\ \(.*\)\ \(.*\)\ \(.*\)/TTYPE=\1 ; TUSER=\2; TGROUP=\3; TMODE=\4; TNAME=\5 TLTARGET=\6/p"` [ "${VERBOSE}" != "no" ] && echo "Checking for -${TNAME}-." -- cgit v1.2.3