diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-01-22 10:04:30 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-01-22 10:04:30 +0000 |
| commit | c3be2a552db104291accd82b2e674d31d5527fcc (patch) | |
| tree | 422e82bf481b26c2a0e883d60b459cbc243d436e /packages/initscripts/initscripts-1.0 | |
| parent | 3a508238c49e86e0476319bfe71a24fdfdd56b66 (diff) | |
| parent | 4693c8ab28f246ce11a0b80b27ab6127aea14c52 (diff) | |
merge of '77df6e755fc8272db3fd5e4c3b0620b4453ca180'
and 'f0261ce1c4acd6350d91bdaaf2939442d84a222d'
Diffstat (limited to 'packages/initscripts/initscripts-1.0')
| -rwxr-xr-x | packages/initscripts/initscripts-1.0/populate-volatile.sh | 5 | ||||
| -rw-r--r-- | packages/initscripts/initscripts-1.0/volatiles | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/packages/initscripts/initscripts-1.0/populate-volatile.sh b/packages/initscripts/initscripts-1.0/populate-volatile.sh index a60cc0d420..3bb3d94de6 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 @@ -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}-." 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: -# <type> <owner> <group> <mode> <path> [<linksource>] +# <type> <owner> <group> <mode> <path> <linksource> # where the items are separated by whitespace ! # # <type> : 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 |