live-session: adopt new path
This commit is contained in:
parent
69a32b35e8
commit
50c1eaf050
6 changed files with 25 additions and 25 deletions
|
@ -68,4 +68,4 @@ SigLevel = Never
|
||||||
|
|
||||||
[gfx-pkgs]
|
[gfx-pkgs]
|
||||||
#SigLevel = Optional TrustAll
|
#SigLevel = Optional TrustAll
|
||||||
Server = file:///opt/livecd/pkgs
|
Server = file:///opt/live/pkgs
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
livetimer=$(date +%s%3N)
|
livetimer=$(date +%s%3N)
|
||||||
[[ -r /opt/livecd/util.sh ]] && source /opt/livecd/util.sh
|
[[ -r /opt/live/util.sh ]] && source /opt/live/util.sh
|
||||||
|
|
||||||
load_profile_config "/opt/livecd/profile.conf"
|
load_profile_config "/opt/live/profile.conf"
|
||||||
|
|
||||||
[[ -r /opt/livecd/util-live.sh ]] && source /opt/livecd/util-live.sh
|
[[ -r /opt/live/util-live.sh ]] && source /opt/live/util-live.sh
|
||||||
echo "Loaded scripts: $(elapsed_time_ms ${livetimer})ms" >> /var/log/livecd.log
|
echo "Loaded scripts: $(elapsed_time_ms ${livetimer})ms" >> /var/log/livecd.log
|
||||||
|
|
||||||
livetimer=$(get_timer_ms)
|
livetimer=$(get_timer_ms)
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
[[ -r /opt/livecd/util.sh ]] && source /opt/livecd/util.sh
|
[[ -r /opt/live/util.sh ]] && source /opt/live/util.sh
|
||||||
[[ -r /opt/livecd/util-live.sh ]] && source /opt/livecd/util-live.sh
|
[[ -r /opt/live/util-live.sh ]] && source /opt/live/util-live.sh
|
||||||
|
|
||||||
USENONFREE="$(kernel_cmdline nonfree no)"
|
USENONFREE="$(kernel_cmdline nonfree no)"
|
||||||
VIDEO="$(kernel_cmdline xdriver no)"
|
VIDEO="$(kernel_cmdline xdriver no)"
|
||||||
|
@ -25,19 +25,19 @@ do
|
||||||
done
|
done
|
||||||
|
|
||||||
# hwdetect_graphics
|
# hwdetect_graphics
|
||||||
if [[ -e "/opt/livecd/pacman-gfx.conf" ]]; then
|
if [[ -e "/opt/live/pacman-gfx.conf" ]]; then
|
||||||
echo "Running MHWD..." >> /var/log/mhwd-live.log
|
echo "Running MHWD..." >> /var/log/mhwd-live.log
|
||||||
if [[ "${USENONFREE}" == "yes" ]] || [[ "${USENONFREE}" == "true" ]]; then
|
if [[ "${USENONFREE}" == "yes" ]] || [[ "${USENONFREE}" == "true" ]]; then
|
||||||
if [[ "${VIDEO}" == "vesa" ]]; then
|
if [[ "${VIDEO}" == "vesa" ]]; then
|
||||||
mhwd --install pci video-vesa --pmconfig "/opt/livecd/pacman-gfx.conf" >> /var/log/mhwd-live.log
|
mhwd --install pci video-vesa --pmconfig "/opt/live/pacman-gfx.conf" >> /var/log/mhwd-live.log
|
||||||
else
|
else
|
||||||
mhwd --auto pci nonfree 0300 --pmconfig "/opt/livecd/pacman-gfx.conf" >> /var/log/mhwd-live.log
|
mhwd --auto pci nonfree 0300 --pmconfig "/opt/live/pacman-gfx.conf" >> /var/log/mhwd-live.log
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
if [[ "${VIDEO}" == "vesa" ]]; then
|
if [[ "${VIDEO}" == "vesa" ]]; then
|
||||||
mhwd --install pci video-vesa --pmconfig "/opt/livecd/pacman-gfx.conf" >> /var/log/mhwd-live.log
|
mhwd --install pci video-vesa --pmconfig "/opt/live/pacman-gfx.conf" >> /var/log/mhwd-live.log
|
||||||
else
|
else
|
||||||
mhwd --auto pci free 0300 --pmconfig "/opt/livecd/pacman-gfx.conf" >> /var/log/mhwd-live.log
|
mhwd --auto pci free 0300 --pmconfig "/opt/live/pacman-gfx.conf" >> /var/log/mhwd-live.log
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -51,7 +51,7 @@ copy_livecd_helpers(){
|
||||||
|
|
||||||
copy_cache_mhwd(){
|
copy_cache_mhwd(){
|
||||||
msg2 "Copying mhwd package cache ..."
|
msg2 "Copying mhwd package cache ..."
|
||||||
rsync -v --files-from="$1/cache-packages.txt" /var/cache/pacman/pkg "$1/opt/livecd/pkgs"
|
rsync -v --files-from="$1/cache-packages.txt" /var/cache/pacman/pkg "$1/opt/live/pkgs"
|
||||||
}
|
}
|
||||||
|
|
||||||
gen_pw(){
|
gen_pw(){
|
||||||
|
@ -289,32 +289,32 @@ configure_displaymanager(){
|
||||||
|
|
||||||
# $1: chroot
|
# $1: chroot
|
||||||
configure_mhwd_drivers(){
|
configure_mhwd_drivers(){
|
||||||
if [ -z "$(ls $1/opt/livecd/pkgs/ | grep catalyst-utils 2> /dev/null)" ]; then
|
if [ -z "$(ls $1/opt/live/pkgs/ | grep catalyst-utils 2> /dev/null)" ]; then
|
||||||
msg2 "Disabling Catalyst driver"
|
msg2 "Disabling Catalyst driver"
|
||||||
mkdir -p $1/var/lib/mhwd/db/pci/graphic_drivers/catalyst/
|
mkdir -p $1/var/lib/mhwd/db/pci/graphic_drivers/catalyst/
|
||||||
touch $1/var/lib/mhwd/db/pci/graphic_drivers/catalyst/MHWDCONFIG
|
touch $1/var/lib/mhwd/db/pci/graphic_drivers/catalyst/MHWDCONFIG
|
||||||
fi
|
fi
|
||||||
if [ -z "$(ls $1/opt/livecd/pkgs/ | grep nvidia-utils 2> /dev/null)" ]; then
|
if [ -z "$(ls $1/opt/live/pkgs/ | grep nvidia-utils 2> /dev/null)" ]; then
|
||||||
msg2 "Disabling Nvidia driver"
|
msg2 "Disabling Nvidia driver"
|
||||||
mkdir -p $1/var/lib/mhwd/db/pci/graphic_drivers/nvidia/
|
mkdir -p $1/var/lib/mhwd/db/pci/graphic_drivers/nvidia/
|
||||||
touch $1/var/lib/mhwd/db/pci/graphic_drivers/nvidia/MHWDCONFIG
|
touch $1/var/lib/mhwd/db/pci/graphic_drivers/nvidia/MHWDCONFIG
|
||||||
fi
|
fi
|
||||||
if [ -z "$(ls $1/opt/livecd/pkgs/ | grep nvidia-utils 2> /dev/null)" ]; then
|
if [ -z "$(ls $1/opt/live/pkgs/ | grep nvidia-utils 2> /dev/null)" ]; then
|
||||||
msg2 "Disabling Nvidia Bumblebee driver"
|
msg2 "Disabling Nvidia Bumblebee driver"
|
||||||
mkdir -p $1/var/lib/mhwd/db/pci/graphic_drivers/hybrid-intel-nvidia-bumblebee/
|
mkdir -p $1/var/lib/mhwd/db/pci/graphic_drivers/hybrid-intel-nvidia-bumblebee/
|
||||||
touch $1/var/lib/mhwd/db/pci/graphic_drivers/hybrid-intel-nvidia-bumblebee/MHWDCONFIG
|
touch $1/var/lib/mhwd/db/pci/graphic_drivers/hybrid-intel-nvidia-bumblebee/MHWDCONFIG
|
||||||
fi
|
fi
|
||||||
if [ -z "$(ls $1/opt/livecd/pkgs/ | grep nvidia-304xx-utils 2> /dev/null)" ]; then
|
if [ -z "$(ls $1/opt/live/pkgs/ | grep nvidia-304xx-utils 2> /dev/null)" ]; then
|
||||||
msg2 "Disabling Nvidia 304xx driver"
|
msg2 "Disabling Nvidia 304xx driver"
|
||||||
mkdir -p $1/var/lib/mhwd/db/pci/graphic_drivers/nvidia-304xx/
|
mkdir -p $1/var/lib/mhwd/db/pci/graphic_drivers/nvidia-304xx/
|
||||||
touch $1/var/lib/mhwd/db/pci/graphic_drivers/nvidia-304xx/MHWDCONFIG
|
touch $1/var/lib/mhwd/db/pci/graphic_drivers/nvidia-304xx/MHWDCONFIG
|
||||||
fi
|
fi
|
||||||
if [ -z "$(ls $1/opt/livecd/pkgs/ | grep nvidia-340xx-utils 2> /dev/null)" ]; then
|
if [ -z "$(ls $1/opt/live/pkgs/ | grep nvidia-340xx-utils 2> /dev/null)" ]; then
|
||||||
msg2 "Disabling Nvidia 340xx driver"
|
msg2 "Disabling Nvidia 340xx driver"
|
||||||
mkdir -p $1/var/lib/mhwd/db/pci/graphic_drivers/nvidia-340xx/
|
mkdir -p $1/var/lib/mhwd/db/pci/graphic_drivers/nvidia-340xx/
|
||||||
touch $1/var/lib/mhwd/db/pci/graphic_drivers/nvidia-340xx/MHWDCONFIG
|
touch $1/var/lib/mhwd/db/pci/graphic_drivers/nvidia-340xx/MHWDCONFIG
|
||||||
fi
|
fi
|
||||||
if [ -z "$(ls $1/opt/livecd/pkgs/ | grep xf86-video-amdgpu 2> /dev/null)" ]; then
|
if [ -z "$(ls $1/opt/live/pkgs/ | grep xf86-video-amdgpu 2> /dev/null)" ]; then
|
||||||
msg2 "Disabling AMD gpu driver"
|
msg2 "Disabling AMD gpu driver"
|
||||||
mkdir -p $1/var/lib/mhwd/db/pci/graphic_drivers/xf86-video-amdgpu/
|
mkdir -p $1/var/lib/mhwd/db/pci/graphic_drivers/xf86-video-amdgpu/
|
||||||
touch $1/var/lib/mhwd/db/pci/graphic_drivers/xf86-video-amdgpu/MHWDCONFIG
|
touch $1/var/lib/mhwd/db/pci/graphic_drivers/xf86-video-amdgpu/MHWDCONFIG
|
||||||
|
@ -409,7 +409,7 @@ configure_live_image(){
|
||||||
}
|
}
|
||||||
|
|
||||||
make_repo(){
|
make_repo(){
|
||||||
repo-add $1/opt/livecd/pkgs/gfx-pkgs.db.tar.gz $1/opt/livecd/pkgs/*pkg*z
|
repo-add $1/opt/live/pkgs/gfx-pkgs.db.tar.gz $1/opt/live/pkgs/*pkg*z
|
||||||
}
|
}
|
||||||
|
|
||||||
# $1: work dir
|
# $1: work dir
|
||||||
|
|
|
@ -195,7 +195,7 @@ make_image_live() {
|
||||||
pacman -Qr "${path}" > "${path}/live-image-pkgs.txt"
|
pacman -Qr "${path}" > "${path}/live-image-pkgs.txt"
|
||||||
copy_overlay "${profile_dir}/live-overlay" "${path}"
|
copy_overlay "${profile_dir}/live-overlay" "${path}"
|
||||||
# copy over setup helpers and config loader
|
# copy over setup helpers and config loader
|
||||||
copy_livecd_helpers "${path}/opt/livecd"
|
copy_livecd_helpers "${path}/opt/live"
|
||||||
copy_startup_scripts "${path}/usr/bin"
|
copy_startup_scripts "${path}/usr/bin"
|
||||||
configure_live_image "${path}"
|
configure_live_image "${path}"
|
||||||
${is_custom_pac_conf} && clean_pacman_conf "${path}"
|
${is_custom_pac_conf} && clean_pacman_conf "${path}"
|
||||||
|
@ -214,7 +214,7 @@ make_image_mhwd() {
|
||||||
if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
|
if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
|
||||||
msg "Prepare [drivers repository] (mhwd-image)"
|
msg "Prepare [drivers repository] (mhwd-image)"
|
||||||
local path="${work_dir}/mhwd-image"
|
local path="${work_dir}/mhwd-image"
|
||||||
mkdir -p ${path}/opt/livecd/pkgs
|
mkdir -p ${path}/opt/live/pkgs
|
||||||
|
|
||||||
if [[ -n "${custom}" ]] ; then
|
if [[ -n "${custom}" ]] ; then
|
||||||
mount_custom_image "${path}"
|
mount_custom_image "${path}"
|
||||||
|
@ -233,10 +233,10 @@ make_image_mhwd() {
|
||||||
|
|
||||||
if [[ -n "${packages_cleanup}" ]]; then
|
if [[ -n "${packages_cleanup}" ]]; then
|
||||||
for mhwd_clean in ${packages_cleanup}; do
|
for mhwd_clean in ${packages_cleanup}; do
|
||||||
rm ${path}/opt/livecd/pkgs/${mhwd_clean}
|
rm ${path}/opt/live/pkgs/${mhwd_clean}
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
cp ${DATADIR}/pacman-gfx.conf ${path}/opt/livecd
|
cp ${DATADIR}/pacman-gfx.conf ${path}/opt/live
|
||||||
make_repo "${path}"
|
make_repo "${path}"
|
||||||
configure_mhwd_drivers "${path}"
|
configure_mhwd_drivers "${path}"
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
# GNU General Public License for more details.
|
# GNU General Public License for more details.
|
||||||
|
|
||||||
# this util-live.sh gets copied to overlay-image/opt/livecd
|
# this util-live.sh gets copied to live-image
|
||||||
|
|
||||||
kernel_cmdline(){
|
kernel_cmdline(){
|
||||||
for param in $(/bin/cat /proc/cmdline); do
|
for param in $(/bin/cat /proc/cmdline); do
|
||||||
|
@ -36,7 +36,7 @@ get_layout(){
|
||||||
}
|
}
|
||||||
|
|
||||||
find_legacy_keymap(){
|
find_legacy_keymap(){
|
||||||
file="/opt/livecd/kbd-model-map"
|
file="/opt/live/kbd-model-map"
|
||||||
while read -r line || [[ -n $line ]]; do
|
while read -r line || [[ -n $line ]]; do
|
||||||
if [[ -z $line ]] || [[ $line == \#* ]]; then
|
if [[ -z $line ]] || [[ $line == \#* ]]; then
|
||||||
continue
|
continue
|
||||||
|
|
Loading…
Reference in a new issue