[all] Drop usrliblocale, use pre-generated locales
This commit is contained in:
parent
8ac5a9fbb3
commit
2ae2f19d5c
6 changed files with 7 additions and 8 deletions
4
arkdep
4
arkdep
|
@ -55,7 +55,7 @@ if [[ ! $1 == 'init' ]]; then
|
||||||
[[ -z ${update_cpu_microcode+x} ]] && update_cpu_microcode=1 && printf '\e[1;33m<!>\e[0m\e[1m update_cpu_microcode not defined in config, using default\e[0m\n'
|
[[ -z ${update_cpu_microcode+x} ]] && update_cpu_microcode=1 && printf '\e[1;33m<!>\e[0m\e[1m update_cpu_microcode not defined in config, using default\e[0m\n'
|
||||||
[[ -z ${backup_user_accounts+x} ]] && backup_user_accounts=1 && printf '\e[1;33m<!>\e[0m\e[1m backup_user_accounts not defined in config, using default\e[0m\n'
|
[[ -z ${backup_user_accounts+x} ]] && backup_user_accounts=1 && printf '\e[1;33m<!>\e[0m\e[1m backup_user_accounts not defined in config, using default\e[0m\n'
|
||||||
[[ -z ${latest_image_always_default+x} ]] && latest_image_always_default=0 && printf '\e[1;33m<!>\e[0m\e[1m latest_image_always_default not defined in config, using default\e[0m\n'
|
[[ -z ${latest_image_always_default+x} ]] && latest_image_always_default=0 && printf '\e[1;33m<!>\e[0m\e[1m latest_image_always_default not defined in config, using default\e[0m\n'
|
||||||
[[ -z ${migrate_files+x} ]] && migrate_files=('var/usrlocal' 'var/usrliblocale' 'var/opt' 'var/srv' 'var/lib/AccountsService' 'var/lib/bluetooth' 'var/lib/NetworkManager' 'var/lib/arkane' 'etc/localtime' 'etc/locale.gen' 'etc/locale.conf' 'etc/NetworkManager/system-connections') && printf '\e[1;33m<!>\e[0m\e[1m migrate_files not defined in config, using default\e[0m\n'
|
[[ -z ${migrate_files+x} ]] && migrate_files=('var/usrlocal' 'var/opt' 'var/srv' 'var/lib/AccountsService' 'var/lib/bluetooth' 'var/lib/NetworkManager' 'var/lib/arkane' 'etc/localtime' 'etc/locale.gen' 'etc/locale.conf' 'etc/NetworkManager/system-connections') && printf '\e[1;33m<!>\e[0m\e[1m migrate_files not defined in config, using default\e[0m\n'
|
||||||
[[ -z ${load_extensions+x} ]] && load_extensions=0 && printf '\e[1;33m<!>\e[0m\e[1m load_extensions not defined in config, using default\e[0m\n'
|
[[ -z ${load_extensions+x} ]] && load_extensions=0 && printf '\e[1;33m<!>\e[0m\e[1m load_extensions not defined in config, using default\e[0m\n'
|
||||||
[[ -z ${remove_tar_after_deployment+x} ]] && remove_tar_after_deployment=1 && printf '\e[1;33m<!>\e[0m\e[1m remove_tar_after_deployment not defined in config, using default\e[0m\n'
|
[[ -z ${remove_tar_after_deployment+x} ]] && remove_tar_after_deployment=1 && printf '\e[1;33m<!>\e[0m\e[1m remove_tar_after_deployment not defined in config, using default\e[0m\n'
|
||||||
[[ -z ${update_diff_style+x} ]] && update_diff_style='list' && printf '\e[1;33m<!>\e[0m\e[1m update_diff_style not defined in config, using default\e[0m\n'
|
[[ -z ${update_diff_style+x} ]] && update_diff_style='list' && printf '\e[1;33m<!>\e[0m\e[1m update_diff_style not defined in config, using default\e[0m\n'
|
||||||
|
@ -371,7 +371,7 @@ init () {
|
||||||
latest_image_always_default=0
|
latest_image_always_default=0
|
||||||
|
|
||||||
# List of files and folders to be recursively copied over from root tree to new root filesystem
|
# List of files and folders to be recursively copied over from root tree to new root filesystem
|
||||||
migrate_files=('var/usrlocal' 'var/usrliblocale' 'var/opt' 'var/srv' 'var/lib/AccountsService' 'var/lib/bluetooth' 'var/lib/NetworkManager' 'var/lib/arkane' 'etc/localtime' 'etc/locale.gen' 'etc/locale.conf' 'etc/NetworkManager/system-connections')
|
migrate_files=('var/usrlocal' 'var/opt' 'var/srv' 'var/lib/AccountsService' 'var/lib/bluetooth' 'var/lib/NetworkManager' 'var/lib/arkane' 'etc/localtime' 'etc/locale.gen' 'etc/locale.conf' 'etc/NetworkManager/system-connections')
|
||||||
|
|
||||||
# Load script extensions from /arkdep/extensions
|
# Load script extensions from /arkdep/extensions
|
||||||
load_extensions=0
|
load_extensions=0
|
||||||
|
|
|
@ -278,10 +278,6 @@ if [[ $type == 'archlinux' ]]; then
|
||||||
mv $workdir/usr/local $workdir/var/usrlocal || cleanup_and_quit 'Failed to move usr/local to var/usrlocal'
|
mv $workdir/usr/local $workdir/var/usrlocal || cleanup_and_quit 'Failed to move usr/local to var/usrlocal'
|
||||||
ln -sv ../var/usrlocal $workdir/usr/local || cleanup_and_quit 'Failed to create usrlocal symlink'
|
ln -sv ../var/usrlocal $workdir/usr/local || cleanup_and_quit 'Failed to create usrlocal symlink'
|
||||||
|
|
||||||
# locale symlink
|
|
||||||
mv $workdir/usr/lib/locale $workdir/var/usrliblocale || cleanup_and_quit 'Failed to move usr/local to var/usrlocal'
|
|
||||||
ln -sv ../../../var/usrliblocale $workdir/usr/lib/locale || cleanup_and_quit 'Failed to create usrlocal symlink'
|
|
||||||
|
|
||||||
# Opt symlink
|
# Opt symlink
|
||||||
mv $workdir/opt $workdir/var/ || cleanup_and_quit 'Failed to move opt to var/opt'
|
mv $workdir/opt $workdir/var/ || cleanup_and_quit 'Failed to move opt to var/opt'
|
||||||
ln -sv var/opt $workdir/opt || cleanup_and_quit 'Failed to create opt symlink'
|
ln -sv var/opt $workdir/opt || cleanup_and_quit 'Failed to create opt symlink'
|
||||||
|
|
|
@ -25,6 +25,7 @@ fuse
|
||||||
fwupd
|
fwupd
|
||||||
gdm
|
gdm
|
||||||
git
|
git
|
||||||
|
glibc-locales
|
||||||
gnome-backgrounds
|
gnome-backgrounds
|
||||||
gnome-console
|
gnome-console
|
||||||
gnome-control-center
|
gnome-control-center
|
||||||
|
|
|
@ -26,10 +26,10 @@ efibootmgr
|
||||||
evince
|
evince
|
||||||
f2fs-tools
|
f2fs-tools
|
||||||
fakeroot
|
fakeroot
|
||||||
firefox
|
|
||||||
flatpak
|
flatpak
|
||||||
fuse
|
fuse
|
||||||
git
|
git
|
||||||
|
glibc-locales
|
||||||
gst-plugin-pipewire
|
gst-plugin-pipewire
|
||||||
gst-plugins-base
|
gst-plugins-base
|
||||||
gst-plugins-good
|
gst-plugins-good
|
||||||
|
|
|
@ -29,6 +29,7 @@ flatpak
|
||||||
fuse
|
fuse
|
||||||
gala
|
gala
|
||||||
git
|
git
|
||||||
|
glibc-locales
|
||||||
gnome-keyring
|
gnome-keyring
|
||||||
gnome-session
|
gnome-session
|
||||||
gnome-settings-daemon
|
gnome-settings-daemon
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
alsa-firmware
|
alsa-firmware
|
||||||
fuse
|
|
||||||
alsa-utils
|
alsa-utils
|
||||||
arkdep
|
arkdep
|
||||||
audiocd-kio
|
audiocd-kio
|
||||||
|
@ -14,6 +13,8 @@ dolphin-plugins
|
||||||
ffmpeg
|
ffmpeg
|
||||||
ffmpegthumbs
|
ffmpegthumbs
|
||||||
flatpak
|
flatpak
|
||||||
|
fuse
|
||||||
|
glibc-locales
|
||||||
gnome-themes-standard
|
gnome-themes-standard
|
||||||
gst-libav
|
gst-libav
|
||||||
gst-plugins-bad
|
gst-plugins-bad
|
||||||
|
|
Loading…
Add table
Reference in a new issue