- Clean the house

- refs #991 Call deploy_installer earliier
user-story-905
Nicolas Arenas 2024-10-18 23:46:47 +00:00
parent d0696f0916
commit b3bbc4e8b6
2 changed files with 2 additions and 25 deletions

View File

@ -95,6 +95,7 @@ then
fi
exec_as_sudo mkdir -p $CHROOT_DIR/etc/calamares/
exec_as_sudo cp -r calamares/* $CHROOT_DIR/etc/calamares/
deploy_installer
# # Create mount points
exec_as_sudo mount --bind /dev/ $CHROOT_DIR/dev
@ -103,7 +104,7 @@ exec_as_sudo mount --bind /run/ $CHROOT_DIR/run
# Execute chroot_setup.sh
exec_as_sudo_in_chroot $CHROOT_DIR /chroot_setup.sh
deploy_installer
# Clean up the environment
umount_in_host $CHROOT_DIR/dev

View File

@ -52,22 +52,6 @@ EOF
chmod +x /root/Desktop/opengnsys-installer.desktop
}
function create_desktop_installer() {
mkdir -p /etc/skel/Desktop/
cat <<EOF > /etc/skel/Desktop/install.desktop
[Desktop Entry]
Name=Install Opengnsys
Commnet=Start the OpenGnsys installer
Exec=calamares
Type=Application
Icon=system-installer
Categories=System;Installer;
Terminal=false
EOF
}
function set_pkg_configuration() {
echo "keyboard-configuration keyboard-configuration/layout select Spanish" | debconf-set-selections
echo "keyboard-configuration keyboard-configuration/variant select Spanish" | debconf-set-selections
@ -178,13 +162,6 @@ function create_image2(){
}
function autostart_calamares() {
mkdir -p /etc/xdg/openbox
echo <<EOF > /etc/xdg/openbox/autostart
calamares &
EOF
}
function install_mesa_repo() {
add-apt-repository ppa:kisak/kisak-mesa
apt -y update
@ -217,7 +194,6 @@ install_no_recommends linux-image-generic
user_add
set_root_passwd
configure_divert
create_desktop_installer
remove_unneeded_packages
reconfigure_packages
configure_sddm