diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /poky/meta/recipes-core/initscripts | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-core/initscripts')
3 files changed, 11 insertions, 4 deletions
diff --git a/poky/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh b/poky/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh index df553bc079..591591f87f 100755 --- a/poky/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh +++ b/poky/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh @@ -8,7 +8,10 @@ # Short-Description: Misc and other. ### END INIT INFO +TIMESTAMP_FILE=/etc/timestamp + . /etc/default/rcS +[ -f /etc/default/timestamp ] && . /etc/default/timestamp # # Put a nologin file in /etc to prevent people from logging in before # system startup is complete. @@ -64,10 +67,10 @@ fi # If the timestamp is more recent than the current time, # use the timestamp instead. test -x /etc/init.d/hwclock.sh && /etc/init.d/hwclock.sh start -if test -e /etc/timestamp +if test -e "$TIMESTAMP_FILE" then SYSTEMDATE=`date -u +%4Y%2m%2d%2H%2M%2S` - read TIMESTAMP < /etc/timestamp + read TIMESTAMP < "$TIMESTAMP_FILE" if [ ${TIMESTAMP} -gt $SYSTEMDATE ]; then # format the timestamp as date expects it (2m2d2H2M4Y.2S) TS_YR=${TIMESTAMP%??????????} diff --git a/poky/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh b/poky/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh index 1632a5f649..ffa1eee43d 100644 --- a/poky/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh +++ b/poky/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh @@ -9,5 +9,9 @@ # Description: ### END INIT INFO +TIMESTAMP_FILE=/etc/timestamp + +[ -f /etc/default/timestamp ] && . /etc/default/timestamp + # Update the timestamp -date -u +%4Y%2m%2d%2H%2M%2S 2>/dev/null > /etc/timestamp +date -u +%4Y%2m%2d%2H%2M%2S 2>/dev/null > "$TIMESTAMP_FILE" diff --git a/poky/meta/recipes-core/initscripts/initscripts-1.0/volatiles b/poky/meta/recipes-core/initscripts/initscripts-1.0/volatiles index 201106645d..cd8a4be05f 100644 --- a/poky/meta/recipes-core/initscripts/initscripts-1.0/volatiles +++ b/poky/meta/recipes-core/initscripts/initscripts-1.0/volatiles @@ -8,7 +8,7 @@ # The # character introduces a comment lasting until end of line. # Blank lines are ignored. # -# <type> : d|f|l : (d)irectory|(f)ile|(l)ink +# <type> : d|f|l|b : (d)irectory|(f)ile|(l)ink|(b)ind # # A linking example: # l root root 0777 /var/test /tmp/testfile |