root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

[basestrap] move out some functions

Browse source
This commit is contained in:
udeved 2015-05-31 23:32:50 +02:00
parent d02fe1ddfe
commit ff3f598f0a
3 changed files with 34 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
bin/basestrap.in
View file

@ -14,38 +14,10 @@ shopt -s extglob
PKGDATADIR='@pkgdatadir@'
[[ -r @libdir@/util.sh ]] && source @libdir@/util.sh
[[ -r @libdir@/util-msg.sh ]] && source @libdir@/util-msg.sh
[[ -r @libdir@/util-mount.sh ]] && source @libdir@/util-mount.sh
fix_dbus(){
# enable to have more debug info
#msg "machine-id (etc): $(cat $newroot/etc/machine-id)"
#[[ -e $newroot/var/lib/dbus/machine-id ]] && msg "machine-id (lib): $(cat $newroot/var/lib/dbus/machine-id)"
#msg "running processes: "
#lsof | grep $newroot
local PREFIX="$1" LINK PID NAME
for ROOT in /proc/*/root; do
LINK=$(readlink $ROOT)
if [ "x$LINK" != "x" ]; then
if [ "x${LINK:0:${#PREFIX}}" = "x$PREFIX" ]; then
# this process is in the chroot...
PID=$(basename $(dirname "$ROOT"))
NAME=$(ps -p $PID -o comm=)
msg3 "Killing chroot process: $NAME ($PID)"
kill -9 "$PID"
fi
fi
done
}
create_min_fs(){
msg 'Creating install root at %s' "$1"
mkdir -m 0755 -p $1/var/{cache/pacman/pkg,lib/pacman,log} $1/{dev,run,etc}
mkdir -m 1777 -p $1/tmp
mkdir -m 0555 -p $1/{sys,proc}
}
newroot=/mnt
hostcache=false
@ -81,13 +53,13 @@ orig_argv=("$@")
while getopts ':C:cdGiM' flag; do
case ${arg} in
C) pacman_config=$OPTARG ;;
B) branch=$OPTARG ;;
b) branch=$OPTARG ;;
d) directory=true ;;
c) hostcache=true ;;
i) interactive=true ;;
G) copykeyring=false ;;
M) copymirrorlist=false ;;
*) echo "invalid argument '${arg}'"; usage 1;;
:) echo "invalid argument ${arg}:$OPTARG"; usage 1;;
?) usage 0 ;;
esac
done
@ -127,7 +99,7 @@ fix_dbus "$newroot"
if ${copykeyring}; then
# if there's a keyring on the host, copy it into the new root, unless it exists already
if [[ -d /etc/pacman.d/gnupg && ! -d $newroot/etc/pacman.d/gnupg ]]; then
if [[ -d /etc/pacman.d/gnupg ]] && [[ ! -d $newroot/etc/pacman.d/gnupg ]]; then
cp -a /etc/pacman.d/gnupg "$newroot/etc/pacman.d/"
fi
fi

7
lib/util-mount.sh
View file

@ -13,6 +13,13 @@ ignore_error() {
return 0
}
create_min_fs(){
msg "Creating install root at $1"
mkdir -m 0755 -p $1/var/{cache/pacman/pkg,lib/pacman,log} $1/{dev,run,etc}
mkdir -m 1777 -p $1/tmp
mkdir -m 0555 -p $1/{sys,proc}
}
chroot_mount() {
mount "$@" && CHROOT_ACTIVE_MOUNTS=("$2" "${CHROOT_ACTIVE_MOUNTS[@]}")
}

23
lib/util.sh
View file

@ -477,3 +477,26 @@ show_config(){
msg2 "manjaro_tools_conf: ${manjaro_tools_conf}"
fi
}
# $1: chroot
fix_dbus(){
# enable to have more debug info
#msg "machine-id (etc): $(cat $1/etc/machine-id)"
#[[ -e $1/var/lib/dbus/machine-id ]] && msg "machine-id (lib): $(cat $1/var/lib/dbus/machine-id)"
#msg "running processes: "
#lsof | grep $1
local PREFIX="$1" LINK PID NAME
for ROOT in /proc/*/root; do
LINK=$(readlink $ROOT)
if [ "x$LINK" != "x" ]; then
if [ "x${LINK:0:${#PREFIX}}" = "x$PREFIX" ]; then
# this process is in the chroot...
PID=$(basename $(dirname "$ROOT"))
NAME=$(ps -p $PID -o comm=)
msg3 "Killing chroot process: $NAME ($PID)"
kill -9 "$PID"
fi
fi
done
}