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

Merge branch 'master' into stable-0.13.x

Browse source
This commit is contained in:
Philip 2016-08-18 21:53:29 +02:00
commit 31970d78a2
3 changed files with 24 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bin/manjaro-chroot.in
View file

@ -27,7 +27,7 @@ display_settings(){
msg "ARGS:"
msg2 "automount: %s" "${automount}"
msg2 "run_args: %s" "${run_args}"
msg2 "run_args: %s" "${run_args[*]}"
msg "PATHS:"
msg2 "chrootdir: %s" "${chrootdir}"
@ -81,7 +81,7 @@ if ${automount};then
else
chrootdir=$1
shift
run_args=$@
run_args="$@"
[[ -d ${chrootdir} ]] || die "Can't create chroot on non-directory %s" "${chrootdir}"
@ -91,4 +91,4 @@ else
chroot_mount /etc/resolv.conf "${chrootdir}/etc/resolv.conf" --bind
fi
SHELL=/bin/sh unshare --fork --pid chroot "${chrootdir}" "${run_args}"
SHELL=/bin/sh unshare --fork --pid chroot "${chrootdir}" ${run_args[*]}

44
lib/util-iso-calamares.sh
View file

@ -208,7 +208,7 @@ write_settings_conf(){
echo " - fstab" >> "$conf"
echo " - locale" >> "$conf"
echo " - keyboard" >> "$conf"
echo " - localegen" >> "$conf"
echo " - localecfg" >> "$conf"
echo " - luksopenswaphookcfg" >> "$conf"
echo " - luksbootkeyfile" >> "$conf"
echo " - initcpiocfg" >> "$conf"
@ -240,56 +240,46 @@ write_settings_conf(){
write_mhwdcfg_conf(){
local conf="$1/etc/calamares/modules/mhwdcfg.conf"
echo "---" > "$conf"
echo "bus_types:" >> "$conf"
echo "bus:" >> "$conf"
echo " - pci" >> "$conf"
echo " - usb" >> "$conf"
echo '' >> "$conf"
echo "identifiers:" >> "$conf"
echo "identifier:" >> "$conf"
echo " net:" >> "$conf"
echo " - '0200'" >> "$conf"
echo " - '0280'" >> "$conf"
echo " vid:" >> "$conf"
echo " - '0300'" >> "$conf"
echo " - 200" >> "$conf"
echo " - 280" >> "$conf"
echo " video:" >> "$conf"
echo " - 300" >> "$conf"
echo '' >> "$conf"
if ${nonfree_xorg};then
echo "driver: nonfree" >> "$conf"
else
echo "driver: free" >> "$conf"
fi
echo '' >> "$conf"
if ${cal_netinstall};then
if ${cal_unpackfs};then
echo "local_repo: true" >> "$conf"
echo "local: true" >> "$conf"
else
echo "local_repo: false" >> "$conf"
echo "local: false" >> "$conf"
fi
else
echo "local_repo: true" >> "$conf"
echo "local: true" >> "$conf"
fi
echo '' >> "$conf"
echo "repo_conf: /opt/live/pacman-gfx.conf" >> "$conf"
}
write_chrootcfg_conf(){
local conf="$1/etc/calamares/modules/chrootcfg.conf" mode='"0o755"'
echo "---" > "$conf"
echo "directories:" >> "$conf"
echo " - name: /etc" >> "$conf"
echo " mode: ${mode}" >> "$conf"
echo " - name: /var/log" >> "$conf"
echo " mode: ${mode}" >> "$conf"
echo "requirements:" >> "$conf"
echo " - name: /var/cache/pacman/pkg" >> "$conf"
echo " mode: ${mode}" >> "$conf"
echo " - name: /var/lib/pacman" >> "$conf"
echo " mode: ${mode}" >> "$conf"
echo '' >> "$conf"
echo "requirements:" >> "$conf"
echo " - pacman" >> "$conf"
echo " - ${kernel}" >> "$conf"
if [[ ${initsys} == 'openrc' ]]; then
echo " - eudev-systemdcompat" >> "$conf"
echo " - udev-openrc" >> "$conf"
fi
echo '' >> "$conf"
echo "keyrings:" >> "$conf"
echo " - archlinux" >> "$conf"
echo " - manjaro" >> "$conf"
echo '' >> "$conf"
echo "branch: ${target_branch}" >> "$conf"
}
write_netinstall_conf(){

8
lib/util-iso-image.sh
View file

@ -321,10 +321,10 @@ clean_up_image(){
if [[ -d "$path" ]]; then
find "$path" -name 'initramfs*.img' -delete &> /dev/null
fi
path=$1/var/lib/pacman/sync
if [[ -d $path ]];then
find "$path" -type f -delete &> /dev/null
fi
# path=$1/var/lib/pacman/sync
# if [[ -d $path ]];then
# find "$path" -type f -delete &> /dev/null
# fi
path=$1/var/cache/pacman/pkg
if [[ -d $path ]]; then
find "$path" -type f -delete &> /dev/null