Skip to content

Commit

Permalink
Consistenly using 'true' instead of 'Yes' or 'yes' when using booleans.
Browse files Browse the repository at this point in the history
  • Loading branch information
daniel-baumann committed Jun 5, 2012
1 parent d16c9d8 commit 97c0e08
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 38 deletions.
4 changes: 2 additions & 2 deletions bin/live-snapshot
Expand Up @@ -187,12 +187,12 @@ Try_refresh ()
FOUND=""
if [ -n "${ROOTSNAP}" ]; then
"${EXECUTABLE}" --resync-string="${ROOTSNAP}"
FOUND="Yes"
FOUND="true"
fi

if [ -n "${HOMESNAP}" ]; then
"${EXECUTABLE}" --resync-string="${HOMESNAP}"
FOUND="Yes"
FOUND="true"
fi

if [ -z "${FOUND}" ]
Expand Down
2 changes: 1 addition & 1 deletion initramfs-tools/scripts/live-bottom/12fstab
Expand Up @@ -83,7 +83,7 @@ fi
# disabled for now
#rm -f /root/etc/rcS.d/S*checkroot.sh

if [ "${NOFASTBOOT}" != "Yes" ]
if [ "${NOFASTBOOT}" != "true" ]
then
touch root/fastboot
fi
Expand Down
52 changes: 26 additions & 26 deletions scripts/boot/arguments.sh
Expand Up @@ -15,10 +15,10 @@ Arguments ()
;;

skipconfig)
NOACCESSIBILITY="Yes"
NOFASTBOOT="Yes"
NOFSTAB="Yes"
NONETWORKING="Yes"
NOACCESSIBILITY="true"
NOFASTBOOT="true"
NOFSTAB="true"
NONETWORKING="true"

export NOACCESSIBILITY NOFASTBOOT NOFSTAB NONETWORKING
;;
Expand All @@ -38,7 +38,7 @@ Arguments ()
;;

debug)
DEBUG="Yes"
DEBUG="true"
export DEBUG

set -x
Expand Down Expand Up @@ -77,7 +77,7 @@ Arguments ()
;;

forcepersistencefsck)
FORCEPERSISTENCEFSCK="Yes"
FORCEPERSISTENCEFSCK="true"
export FORCEPERSISTENCEFSCK
;;

Expand Down Expand Up @@ -110,12 +110,12 @@ Arguments ()
;;

ignore_uuid)
IGNORE_UUID="Yes"
IGNORE_UUID="true"
export IGNORE_UUID
;;

integrity-check)
INTEGRITY_CHECK="Yes"
INTEGRITY_CHECK="true"
export INTEGRITY_CHECK
;;

Expand Down Expand Up @@ -181,22 +181,22 @@ Arguments ()
;;

noaccessibility)
NOACCESSIBILITY="Yes"
NOACCESSIBILITY="true"
export NOACCESSIBILITY
;;

nofastboot)
NOFASTBOOT="Yes"
NOFASTBOOT="true"
export NOFASTBOOT
;;

nofstab)
NOFSTAB="Yes"
NOFSTAB="true"
export NOFSTAB
;;

nonetworking)
NONETWORKING="Yes"
NONETWORKING="true"
export NONETWORKING
;;

Expand All @@ -205,12 +205,12 @@ Arguments ()
;;

swapon)
SWAPON="Yes"
SWAPON="true"
export SWAPON
;;

persistence)
PERSISTENCE="Yes"
PERSISTENCE="true"
export PERSISTENCE
;;

Expand All @@ -233,7 +233,7 @@ Arguments ()
export PERSISTENCE_PATH
;;
persistence-read-only)
PERSISTENCE_READONLY="Yes"
PERSISTENCE_READONLY="true"
export PERSISTENCE_READONLY
;;

Expand All @@ -252,12 +252,12 @@ Arguments ()
;;

nopersistence)
NOPERSISTENCE="Yes"
NOPERSISTENCE="true"
export NOPERSISTENCE
;;

noprompt)
NOPROMPT="Yes"
NOPROMPT="true"
export NOPROMPT
;;

Expand All @@ -267,7 +267,7 @@ Arguments ()
;;

quickusbmodules)
QUICKUSBMODULES="Yes"
QUICKUSBMODULES="true"
export QUICKUSBMODULES
;;

Expand All @@ -277,7 +277,7 @@ Arguments ()
;;

nopreseed)
NOPRESEED="Yes"
NOPRESEED="true"
export NOPRESEED
;;

Expand All @@ -289,12 +289,12 @@ Arguments ()
;;

showmounts)
SHOWMOUNTS="Yes"
SHOWMOUNTS="true"
export SHOWMOUNTS
;;

silent)
SILENT="Yes"
SILENT="true"
export SILENT
;;

Expand All @@ -304,28 +304,28 @@ Arguments ()
;;

toram)
TORAM="Yes"
TORAM="true"
export TORAM
;;

toram=*)
TORAM="Yes"
TORAM="true"
MODULETORAM="${ARGUMENT#toram=}"
export TORAM MODULETORAM
;;

exposedroot)
EXPOSED_ROOT="Yes"
EXPOSED_ROOT="true"
export EXPOSED_ROOT
;;

plainroot)
PLAIN_ROOT="Yes"
PLAIN_ROOT="true"
export PLAIN_ROOT
;;

skipunion)
SKIP_UNION_MOUNTS="Yes"
SKIP_UNION_MOUNTS="true"
export SKIP_UNION_MOUNTS
;;

Expand Down
16 changes: 8 additions & 8 deletions scripts/boot/misc-helpers.sh
Expand Up @@ -712,16 +712,16 @@ removable_dev ()
then
if [ -z "${want_usb}" ]
then
dev_ok="yes"
dev_ok="true"
else
if readlink ${sysblock} | grep -q usb
then
dev_ok="yes"
dev_ok="true"
fi
fi
fi

if [ "${dev_ok}" = "yes" ]
if [ "${dev_ok}" = "true" ]
then
case "${output_format}" in
sys)
Expand Down Expand Up @@ -940,7 +940,7 @@ get_custom_mounts ()
opt_source=${opt#source=}
;;
link)
opt_link="yes"
opt_link="true"
;;
union|bind)
;;
Expand Down Expand Up @@ -1008,22 +1008,22 @@ activate_custom_mounts ()

while read device source dest options # < ${custom_mounts}
do
local opt_bind="yes"
local opt_bind="true"
local opt_link=""
local opt_union=""
for opt in $(echo ${options} | tr ',' ' ');
do
case "${opt}" in
bind)
opt_bind="yes"
opt_bind="true"
unset opt_link opt_union
;;
link)
opt_link="yes"
opt_link="true"
unset opt_bind opt_union
;;
union)
opt_union="yes"
opt_union="true"
unset opt_bind opt_link
;;
esac
Expand Down
2 changes: 1 addition & 1 deletion scripts/boot/mount-iscsi.sh
Expand Up @@ -8,7 +8,7 @@ do_iscsi()
#modprobe ib_iser
modprobe iscsi_tcp
local debugopt=""
[ "${DEBUG}" = "Yes" ] && debugopt="-d 8"
[ "${DEBUG}" = "true" ] && debugopt="-d 8"
#FIXME this name is supposed to be unique - some date + ifconfig hash?
ISCSI_INITIATORNAME="iqn.1993-08.org.debian.live:01:$(echo "${HWADDR}" | sed -e s/://g)"
export ISCSI_INITIATORNAME
Expand Down

0 comments on commit 97c0e08

Please sign in to comment.