diff options
| author | Jan Macku <jamacku@redhat.com> | 2019-09-12 12:32:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-12 12:32:36 +0200 |
| commit | 66d26269a83229b7340f7ace06dfc715c04df7d8 (patch) | |
| tree | d25afcbba9d13d50f62fe8177ab4863c0c220c47 /usr | |
| parent | dd703a8494647d401dbffa0f036233e08044ec60 (diff) | |
| download | initscripts-66d26269a83229b7340f7ace06dfc715c04df7d8.tar initscripts-66d26269a83229b7340f7ace06dfc715c04df7d8.tar.gz initscripts-66d26269a83229b7340f7ace06dfc715c04df7d8.tar.bz2 initscripts-66d26269a83229b7340f7ace06dfc715c04df7d8.tar.xz initscripts-66d26269a83229b7340f7ace06dfc715c04df7d8.zip | |
Repalace hardcoded tests for yes and no with testing functions
Resolve issue: #42
Diffstat (limited to 'usr')
| -rwxr-xr-x | usr/libexec/readonly-root | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/libexec/readonly-root b/usr/libexec/readonly-root index a3679580..9b9c2824 100755 --- a/usr/libexec/readonly-root +++ b/usr/libexec/readonly-root @@ -43,7 +43,7 @@ if strstr "$cmdline" noreadonlyroot ; then fi MOUNTS=() -if [ "$READONLY" = "yes" -o "$TEMPORARY_STATE" = "yes" ]; then +if is_true "$READONLY" || is_true "$TEMPORARY_STATE"; then add_mount() { mnt=${1%/} @@ -80,7 +80,7 @@ if [ "$READONLY" = "yes" -o "$TEMPORARY_STATE" = "yes" ]; then rw_mount_dev=$(blkid -t LABEL="$RW_LABEL" -l -o device) bindmountopts= - [ "$SLAVE_MOUNTS" = "yes" ] && bindmountopts="--make-slave" + is_true "$SLAVE_MOUNTS" && bindmountopts="--make-slave" # First try to mount scratch storage from /etc/fstab, then any # partition with the proper label. If either succeeds, be sure |