22.04.3: Populating LWRISO_ROOT

luwrain · Apr 10, 2024 · 62bc816 · 62bc816
1 parent b8e0124
commit 62bc816
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/ubuntu/22.04.3/scripts/base.sh b/ubuntu/22.04.3/scripts/base.sh
@@ -13,7 +13,7 @@ fi
 
 chroot-run()
 {
- chroot ./chroot "$@"
+ chroot $LWRISO_ROOT "$@"
 }
 
 install-pkg()

diff --git a/ubuntu/22.04.3/scripts/scripts.d/03-sources.list b/ubuntu/22.04.3/scripts/scripts.d/03-sources.list
@@ -6,7 +6,7 @@ deb http:https://ru.archive.ubuntu.com/ubuntu/ $UBUNTU_RELEASE main restricted univers
 EOF
 apt-get update
 
-cat <<EOF > ./chroot/etc/apt/sources.list
+cat <<EOF > $LWRISO_ROOT/etc/apt/sources.list
 deb https://download.luwrain.org/repo/ luwrain $UBUNTU_RELEASE
 deb http:https://security.ubuntu.com/ubuntu/ $UBUNTU_RELEASE-security main restricted universe multiverse
 deb http:https://ru.archive.ubuntu.com/ubuntu/ $UBUNTU_RELEASE-updates main restricted universe multiverse

diff --git a/ubuntu/22.04.3/scripts/scripts.d/15-lang-ru b/ubuntu/22.04.3/scripts/scripts.d/15-lang-ru
@@ -1,9 +1,9 @@
 
 # Locale
-#echo 'LANG="ru_RU.UTF-8"' > ./chroot/etc/default/locale
+#echo 'LANG="ru_RU.UTF-8"' > $LWRISO_ROOT/etc/default/locale
 # For proper Russian characters in console
 # FIXME!
-#sed -i -e s:'^ExecStart=.*$':'ExecStart=/bin/setupcon': ./chroot/lib/systemd/system/systemd-vconsole-setup.service
+#sed -i -e s:'^ExecStart=.*$':'ExecStart=/bin/setupcon': $LWRISO_ROOT/lib/systemd/system/systemd-vconsole-setup.service
 
 install-pkg language-pack-ru language-pack-ru-base