summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2012-02-15 13:05:33 +0100
committerDaniel Baumann <daniel@debian.org>2012-04-05 07:45:57 +0200
commit267ca87d0d2892d69682228b65e49418d1aa93dd (patch)
tree35dd2911d1abce619b323dcc0bdf740d963592aa /scripts
parentbb77d0efe779cd9e2e245e7f56f3abbd2baa7d72 (diff)
downloadlive-boot-267ca87d0d2892d69682228b65e49418d1aa93dd.tar.gz
live-boot-267ca87d0d2892d69682228b65e49418d1aa93dd.zip
Fixup some style issues.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/live-helpers21
1 files changed, 14 insertions, 7 deletions
diff --git a/scripts/live-helpers b/scripts/live-helpers
index 8822125..b2aa125 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -761,12 +761,14 @@ open_luks_device ()
done
}
-get_gpt_name () {
+get_gpt_name ()
+{
local dev="${1}"
/sbin/blkid -s PART_ENTRY_NAME -p -o value ${dev} 2>/dev/null
}
-is_gpt_device () {
+is_gpt_device ()
+{
local dev="${1}"
[ "$(/sbin/blkid -s PART_ENTRY_SCHEME -p -o value ${dev} 2>/dev/null)" = "gpt" ]
}
@@ -792,7 +794,8 @@ probe_for_gpt_name ()
done
}
-probe_for_fs_label () {
+probe_for_fs_label ()
+{
local overlays="${1}"
local snapshots="${2}"
local dev="${3}"
@@ -806,7 +809,8 @@ probe_for_fs_label () {
done
}
-probe_for_file_name () {
+probe_for_file_name ()
+{
local overlays="${1}"
local snapshots="${2}"
local dev="${3}"
@@ -1103,7 +1107,8 @@ link_files ()
done
}
-do_union () {
+do_union ()
+{
local unionmountpoint="${1}" # directory where the union is mounted
local unionrw="${2}" # branch where the union changes are stored
local unionro1="${3}" # first underlying read-only branch (optional)
@@ -1163,7 +1168,8 @@ do_union () {
esac
}
-get_custom_mounts () {
+get_custom_mounts ()
+{
# Side-effect: leaves $devices with live.persist mounted in ${rootmnt}/live/persistent
# Side-effect: prints info to file $custom_mounts
@@ -1294,7 +1300,8 @@ get_custom_mounts () {
[ -e "${links}" ] && sort -k2 -sbu ${links} >> ${custom_mounts} && rm ${links}
}
-do_custom_mounts () {
+do_custom_mounts ()
+{
local custom_mounts="${1}" # the ouput from get_custom_mounts()
local rootmnt="${2}" # should be set empty post-live-boot