mirror of
https://github.com/systemd/systemd
synced 2024-10-15 20:45:09 +00:00
TEST-01-BASIC, TEST-02-CRYPTSETUP: fixed strip
also output more status about failed jobs
This commit is contained in:
parent
ddca82aca0
commit
07ba977575
|
@ -132,7 +132,7 @@ Description=Testsuite service
|
||||||
After=multi-user.target
|
After=multi-user.target
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
ExecStart=/bin/bash -c 'set -x; systemctl --failed --no-legend --no-pager > /failed ; echo OK > /testok; while : ;do echo "testsuite service waiting for journal to move to /var/log/journal" > /dev/console ; for i in /var/log/journal/*;do [ -d "\$i" ] && echo "\$i" && break 2; done; sleep 1; done; sleep 1; exit 0;'
|
ExecStart=/bin/bash -c 'set -x; ( systemctl --failed --no-legend --no-pager; systemctl status --failed ) > /failed ; echo OK > /testok; while : ;do echo "testsuite service waiting for journal to move to /var/log/journal" > /dev/console ; for i in /var/log/journal/*;do [ -d "\$i" ] && echo "\$i" && break 2; done; sleep 1; done; sleep 1; exit 0;'
|
||||||
Type=oneshot
|
Type=oneshot
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
@ -190,7 +190,7 @@ EOF
|
||||||
# softlink mtab
|
# softlink mtab
|
||||||
ln -fs /proc/self/mounts $initdir/etc/mtab
|
ln -fs /proc/self/mounts $initdir/etc/mtab
|
||||||
|
|
||||||
# install any Exec's from the service files
|
# install any Execs from the service files
|
||||||
egrep -ho '^Exec[^ ]*=[^ ]+' $initdir/lib/systemd/system/*.service \
|
egrep -ho '^Exec[^ ]*=[^ ]+' $initdir/lib/systemd/system/*.service \
|
||||||
| while read i; do
|
| while read i; do
|
||||||
i=${i##Exec*=}; i=${i##-}
|
i=${i##Exec*=}; i=${i##-}
|
||||||
|
@ -213,7 +213,7 @@ EOF
|
||||||
cp -a /etc/ld.so.conf* $initdir/etc
|
cp -a /etc/ld.so.conf* $initdir/etc
|
||||||
ldconfig -r "$initdir"
|
ldconfig -r "$initdir"
|
||||||
ddebug "Strip binaries"
|
ddebug "Strip binaries"
|
||||||
find "$initdir" -perm +111 -type f | xargs strip --strip-unneeded | ddebug
|
find "$initdir" -executable -not -path '*/lib/modules/*.ko' -type f | xargs strip --strip-unneeded | ddebug
|
||||||
|
|
||||||
# copy depmod files
|
# copy depmod files
|
||||||
inst /lib/modules/$KERNEL_VER/modules.order
|
inst /lib/modules/$KERNEL_VER/modules.order
|
||||||
|
|
|
@ -131,7 +131,7 @@ Description=Testsuite service
|
||||||
After=multi-user.target
|
After=multi-user.target
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
ExecStart=/bin/bash -c 'set -x; systemctl --failed --no-legend --no-pager > /failed ; echo OK > /testok; while : ;do systemd-cat echo "testsuite service waiting for /var/log/journal" ; echo "testsuite service waiting for journal to move to /var/log/journal" > /dev/console ; for i in /var/log/journal/*;do [ -d "\$i" ] && echo "\$i" && break 2; done; sleep 1; done; sleep 1; exit 0;'
|
ExecStart=/bin/bash -c 'set -x; ( systemctl --failed --no-legend --no-pager; systemctl status --failed ) > /failed ; echo OK > /testok; while : ;do systemd-cat echo "testsuite service waiting for /var/log/journal" ; echo "testsuite service waiting for journal to move to /var/log/journal" > /dev/console ; for i in /var/log/journal/*;do [ -d "\$i" ] && echo "\$i" && break 2; done; sleep 1; done; sleep 1; exit 0;'
|
||||||
Type=oneshot
|
Type=oneshot
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
@ -197,7 +197,7 @@ EOF
|
||||||
# softlink mtab
|
# softlink mtab
|
||||||
ln -fs /proc/self/mounts $initdir/etc/mtab
|
ln -fs /proc/self/mounts $initdir/etc/mtab
|
||||||
|
|
||||||
# install any Exec's from the service files
|
# install any Execs from the service files
|
||||||
egrep -ho '^Exec[^ ]*=[^ ]+' $initdir/lib/systemd/system/*.service \
|
egrep -ho '^Exec[^ ]*=[^ ]+' $initdir/lib/systemd/system/*.service \
|
||||||
| while read i; do
|
| while read i; do
|
||||||
i=${i##Exec*=}; i=${i##-}
|
i=${i##Exec*=}; i=${i##-}
|
||||||
|
@ -220,7 +220,7 @@ EOF
|
||||||
cp -a /etc/ld.so.conf* $initdir/etc
|
cp -a /etc/ld.so.conf* $initdir/etc
|
||||||
ldconfig -r "$initdir"
|
ldconfig -r "$initdir"
|
||||||
ddebug "Strip binaeries"
|
ddebug "Strip binaeries"
|
||||||
find "$initdir" -perm +111 -type f | xargs strip --strip-unneeded | ddebug
|
find "$initdir" -executable -not -path '*/lib/modules/*.ko' -type f | xargs strip --strip-unneeded | ddebug
|
||||||
|
|
||||||
# copy depmod files
|
# copy depmod files
|
||||||
inst /lib/modules/$KERNEL_VER/modules.order
|
inst /lib/modules/$KERNEL_VER/modules.order
|
||||||
|
|
Loading…
Reference in a new issue