iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
check for killing ourself
[distro-setup]
/
distro-begin
diff --git
a/distro-begin
b/distro-begin
index e77ff04a5827f1d7200b35718cb2205276613ad0..35c904a929d05693c03e73ef213fd6740843efa1 100755
(executable)
--- a/
distro-begin
+++ b/
distro-begin
@@
-61,8
+61,6
@@
fi
### arg parsing
recompile=false
### arg parsing
recompile=false
-# for copying to a new data fs
-bootstrapfs=false # old flag, needs new look before using.
while [[ $1 == -* ]]; do
case $1 in
-r) recompile=true; shift ;;
while [[ $1 == -* ]]; do
case $1 in
-r) recompile=true; shift ;;
@@
-74,12
+72,12
@@
fi
##### variables/env setup
##### variables/env setup
-script_dir="$(readlink -f "$BASH_SOURCE")"
+script_dir="$(readlink -f "$BASH_SOURCE")"
; script_dir=${script_dir%/*}
source $script_dir/pkgs
set +x
source /a/bin/distro-functions/src/identify-distros
$interactive || set -x
source $script_dir/pkgs
set +x
source /a/bin/distro-functions/src/identify-distros
$interactive || set -x
-for f in iank-dev htpc
treetowl
x2 frodo tp li lj demohost kw fz; do
+for f in iank-dev htpc
kd
x2 frodo tp li lj demohost kw fz; do
eval "$f() { [[ $HOSTNAME == $f ]]; }"
done
has_p() { ! linode; } # when tp is tracis, then not tp either
eval "$f() { [[ $HOSTNAME == $f ]]; }"
done
has_p() { ! linode; } # when tp is tracis, then not tp either
@@
-223,6
+221,11
@@
Defaults env_keep += SUDOD
# makes ubuntu be like debian
# https://unix.stackexchange.com/a/91572
Defaults always_set_home
# makes ubuntu be like debian
# https://unix.stackexchange.com/a/91572
Defaults always_set_home
+# default setting is to have minimum umask of 0022
+# This lets us have user-specific umasks which are more permissive.
+# I did this for transmission and set it's umask gecos on install,
+# see there for more info.
+Defaults !umask
EOF
EOF
@@
-469,7
+472,7
@@
EOF
fi
##### setup /nocow.
fi
##### setup /nocow.
-# a nocow dir that is common to multiple distros installed onthe same system
+# a nocow dir that is common to multiple distros installed on
the same system
dir=/nocow
if has_btrfs; then
if ! mountpoint $dir; then
dir=/nocow
if has_btrfs; then
if ! mountpoint $dir; then