projects
/
live-boot-grml.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
d16c9d8
)
Consistenly using 'true' instead of 'Yes' or 'yes' when using booleans.
author
Daniel Baumann
<daniel@debian.org>
Tue, 5 Jun 2012 14:39:52 +0000
(16:39 +0200)
committer
Daniel Baumann
<daniel@debian.org>
Tue, 5 Jun 2012 17:35:56 +0000
(19:35 +0200)
bin/live-snapshot
patch
|
blob
|
history
initramfs-tools/scripts/live-bottom/12fstab
patch
|
blob
|
history
scripts/boot/arguments.sh
patch
|
blob
|
history
scripts/boot/misc-helpers.sh
patch
|
blob
|
history
scripts/boot/mount-iscsi.sh
patch
|
blob
|
history
diff --git
a/bin/live-snapshot
b/bin/live-snapshot
index
e684824
..
46ae597
100755
(executable)
--- a/
bin/live-snapshot
+++ b/
bin/live-snapshot
@@
-187,12
+187,12
@@
Try_refresh ()
FOUND=""
if [ -n "${ROOTSNAP}" ]; then
"${EXECUTABLE}" --resync-string="${ROOTSNAP}"
FOUND=""
if [ -n "${ROOTSNAP}" ]; then
"${EXECUTABLE}" --resync-string="${ROOTSNAP}"
- FOUND="
Yes
"
+ FOUND="
true
"
fi
if [ -n "${HOMESNAP}" ]; then
"${EXECUTABLE}" --resync-string="${HOMESNAP}"
fi
if [ -n "${HOMESNAP}" ]; then
"${EXECUTABLE}" --resync-string="${HOMESNAP}"
- FOUND="
Yes
"
+ FOUND="
true
"
fi
if [ -z "${FOUND}" ]
fi
if [ -z "${FOUND}" ]
diff --git
a/initramfs-tools/scripts/live-bottom/12fstab
b/initramfs-tools/scripts/live-bottom/12fstab
index
89f6e1e
..
e0b248a
100755
(executable)
--- a/
initramfs-tools/scripts/live-bottom/12fstab
+++ b/
initramfs-tools/scripts/live-bottom/12fstab
@@
-83,7
+83,7
@@
fi
# disabled for now
#rm -f /root/etc/rcS.d/S*checkroot.sh
# disabled for now
#rm -f /root/etc/rcS.d/S*checkroot.sh
-if [ "${NOFASTBOOT}" != "
Yes
" ]
+if [ "${NOFASTBOOT}" != "
true
" ]
then
touch root/fastboot
fi
then
touch root/fastboot
fi
diff --git
a/scripts/boot/arguments.sh
b/scripts/boot/arguments.sh
index
c526b9a
..
e8636ee
100755
(executable)
--- a/
scripts/boot/arguments.sh
+++ b/
scripts/boot/arguments.sh
@@
-15,10
+15,10
@@
Arguments ()
;;
skipconfig)
;;
skipconfig)
- NOACCESSIBILITY="
Yes
"
- NOFASTBOOT="
Yes
"
- NOFSTAB="
Yes
"
- NONETWORKING="
Yes
"
+ NOACCESSIBILITY="
true
"
+ NOFASTBOOT="
true
"
+ NOFSTAB="
true
"
+ NONETWORKING="
true
"
export NOACCESSIBILITY NOFASTBOOT NOFSTAB NONETWORKING
;;
export NOACCESSIBILITY NOFASTBOOT NOFSTAB NONETWORKING
;;
@@
-38,7
+38,7
@@
Arguments ()
;;
debug)
;;
debug)
- DEBUG="
Yes
"
+ DEBUG="
true
"
export DEBUG
set -x
export DEBUG
set -x
@@
-77,7
+77,7
@@
Arguments ()
;;
forcepersistencefsck)
;;
forcepersistencefsck)
- FORCEPERSISTENCEFSCK="
Yes
"
+ FORCEPERSISTENCEFSCK="
true
"
export FORCEPERSISTENCEFSCK
;;
export FORCEPERSISTENCEFSCK
;;
@@
-110,12
+110,12
@@
Arguments ()
;;
ignore_uuid)
;;
ignore_uuid)
- IGNORE_UUID="
Yes
"
+ IGNORE_UUID="
true
"
export IGNORE_UUID
;;
integrity-check)
export IGNORE_UUID
;;
integrity-check)
- INTEGRITY_CHECK="
Yes
"
+ INTEGRITY_CHECK="
true
"
export INTEGRITY_CHECK
;;
export INTEGRITY_CHECK
;;
@@
-181,22
+181,22
@@
Arguments ()
;;
noaccessibility)
;;
noaccessibility)
- NOACCESSIBILITY="
Yes
"
+ NOACCESSIBILITY="
true
"
export NOACCESSIBILITY
;;
nofastboot)
export NOACCESSIBILITY
;;
nofastboot)
- NOFASTBOOT="
Yes
"
+ NOFASTBOOT="
true
"
export NOFASTBOOT
;;
nofstab)
export NOFASTBOOT
;;
nofstab)
- NOFSTAB="
Yes
"
+ NOFSTAB="
true
"
export NOFSTAB
;;
nonetworking)
export NOFSTAB
;;
nonetworking)
- NONETWORKING="
Yes
"
+ NONETWORKING="
true
"
export NONETWORKING
;;
export NONETWORKING
;;
@@
-205,12
+205,12
@@
Arguments ()
;;
swapon)
;;
swapon)
- SWAPON="
Yes
"
+ SWAPON="
true
"
export SWAPON
;;
persistence)
export SWAPON
;;
persistence)
- PERSISTENCE="
Yes
"
+ PERSISTENCE="
true
"
export PERSISTENCE
;;
export PERSISTENCE
;;
@@
-233,7
+233,7
@@
Arguments ()
export PERSISTENCE_PATH
;;
persistence-read-only)
export PERSISTENCE_PATH
;;
persistence-read-only)
- PERSISTENCE_READONLY="
Yes
"
+ PERSISTENCE_READONLY="
true
"
export PERSISTENCE_READONLY
;;
export PERSISTENCE_READONLY
;;
@@
-252,12
+252,12
@@
Arguments ()
;;
nopersistence)
;;
nopersistence)
- NOPERSISTENCE="
Yes
"
+ NOPERSISTENCE="
true
"
export NOPERSISTENCE
;;
noprompt)
export NOPERSISTENCE
;;
noprompt)
- NOPROMPT="
Yes
"
+ NOPROMPT="
true
"
export NOPROMPT
;;
export NOPROMPT
;;
@@
-267,7
+267,7
@@
Arguments ()
;;
quickusbmodules)
;;
quickusbmodules)
- QUICKUSBMODULES="
Yes
"
+ QUICKUSBMODULES="
true
"
export QUICKUSBMODULES
;;
export QUICKUSBMODULES
;;
@@
-277,7
+277,7
@@
Arguments ()
;;
nopreseed)
;;
nopreseed)
- NOPRESEED="
Yes
"
+ NOPRESEED="
true
"
export NOPRESEED
;;
export NOPRESEED
;;
@@
-289,12
+289,12
@@
Arguments ()
;;
showmounts)
;;
showmounts)
- SHOWMOUNTS="
Yes
"
+ SHOWMOUNTS="
true
"
export SHOWMOUNTS
;;
silent)
export SHOWMOUNTS
;;
silent)
- SILENT="
Yes
"
+ SILENT="
true
"
export SILENT
;;
export SILENT
;;
@@
-304,28
+304,28
@@
Arguments ()
;;
toram)
;;
toram)
- TORAM="
Yes
"
+ TORAM="
true
"
export TORAM
;;
toram=*)
export TORAM
;;
toram=*)
- TORAM="
Yes
"
+ TORAM="
true
"
MODULETORAM="${ARGUMENT#toram=}"
export TORAM MODULETORAM
;;
exposedroot)
MODULETORAM="${ARGUMENT#toram=}"
export TORAM MODULETORAM
;;
exposedroot)
- EXPOSED_ROOT="
Yes
"
+ EXPOSED_ROOT="
true
"
export EXPOSED_ROOT
;;
plainroot)
export EXPOSED_ROOT
;;
plainroot)
- PLAIN_ROOT="
Yes
"
+ PLAIN_ROOT="
true
"
export PLAIN_ROOT
;;
skipunion)
export PLAIN_ROOT
;;
skipunion)
- SKIP_UNION_MOUNTS="
Yes
"
+ SKIP_UNION_MOUNTS="
true
"
export SKIP_UNION_MOUNTS
;;
export SKIP_UNION_MOUNTS
;;
diff --git
a/scripts/boot/misc-helpers.sh
b/scripts/boot/misc-helpers.sh
index
abb2dd2
..
856a023
100755
(executable)
--- a/
scripts/boot/misc-helpers.sh
+++ b/
scripts/boot/misc-helpers.sh
@@
-712,16
+712,16
@@
removable_dev ()
then
if [ -z "${want_usb}" ]
then
then
if [ -z "${want_usb}" ]
then
- dev_ok="
yes
"
+ dev_ok="
true
"
else
if readlink ${sysblock} | grep -q usb
then
else
if readlink ${sysblock} | grep -q usb
then
- dev_ok="
yes
"
+ dev_ok="
true
"
fi
fi
fi
fi
fi
fi
- if [ "${dev_ok}" = "
yes
" ]
+ if [ "${dev_ok}" = "
true
" ]
then
case "${output_format}" in
sys)
then
case "${output_format}" in
sys)
@@
-940,7
+940,7
@@
get_custom_mounts ()
opt_source=${opt#source=}
;;
link)
opt_source=${opt#source=}
;;
link)
- opt_link="
yes
"
+ opt_link="
true
"
;;
union|bind)
;;
;;
union|bind)
;;
@@
-1008,22
+1008,22
@@
activate_custom_mounts ()
while read device source dest options # < ${custom_mounts}
do
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)
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)
unset opt_link opt_union
;;
link)
- opt_link="
yes
"
+ opt_link="
true
"
unset opt_bind opt_union
;;
union)
unset opt_bind opt_union
;;
union)
- opt_union="
yes
"
+ opt_union="
true
"
unset opt_bind opt_link
;;
esac
unset opt_bind opt_link
;;
esac
diff --git
a/scripts/boot/mount-iscsi.sh
b/scripts/boot/mount-iscsi.sh
index
35e2b46
..
fd29d91
100755
(executable)
--- a/
scripts/boot/mount-iscsi.sh
+++ b/
scripts/boot/mount-iscsi.sh
@@
-8,7
+8,7
@@
do_iscsi()
#modprobe ib_iser
modprobe iscsi_tcp
local debugopt=""
#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
#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