Skip to content
Snippets Groups Projects
Commit c9ed22ff authored by Eric Vidal's avatar Eric Vidal :speech_balloon:
Browse files

fix plasma customizeChroot file

parent 450b36de
Branches
Tags
No related merge requests found
......@@ -48,8 +48,6 @@ create_log_user(){
oblog "add ${NEWUSER} at log group"
gpasswd -a "$NEWUSER" log
}
custo_once create_log_user
config_tree_boot(){
......@@ -127,6 +125,7 @@ config_enable_base_user(){
su "${NEWUSER}" -c "66-enable -zv3 xdg-user-dirs dbus-session@${NEWUSER}" || die "unable to enable xdg-user-dirs dbus-session@${NEWUSER} service"
}
custo_once create_log_user
custo_once config_tree_boot
custo_once config_enable_boot
custo_once config_tree_root
......
......@@ -44,6 +44,11 @@ custo_once() {
############################## only modifie this script after this line ############################
create_log_user(){
oblog "add ${NEWUSER} at log group"
gpasswd -a "$NEWUSER" log
}
config_tree_boot(){
oblog "Create tree boot"
......@@ -91,6 +96,7 @@ config_enable_root(){
66-enable -zv3 -t root dhcpcd || die "unable to enable dhcpcd"
}
custo_once create_log_user
custo_once config_tree_boot
custo_once config_enable_boot
custo_once config_tree_root
......
......@@ -48,7 +48,6 @@ create_log_user(){
oblog "add ${NEWUSER} at log group"
gpasswd -a "$NEWUSER" log
}
custo_once create_log_user
config_tree_boot(){
......@@ -135,6 +134,7 @@ config_enable_base_user(){
su "${NEWUSER}" -c "66-enable -zv3 xdg-user-dirs dbus-session@${NEWUSER}" || die "unable to enable xdg-user-dirs dbus-session@${NEWUSER} service"
}
custo_once create_log_user
custo_once config_tree_boot
custo_once config_enable_boot
custo_once config_tree_root
......
......@@ -53,7 +53,6 @@ create_log_user(){
oblog "add ${NEWUSER} to log group"
gpasswd -a "$NEWUSER" log
}
custo_once create_log_user
config_tree_boot(){
......@@ -205,6 +204,7 @@ config_enable_base_user(){
out_progress "Done"
}
custo_once create_log_user
custo_once config_tree_boot
custo_once config_enable_boot
custo_once config_tree_root
......
......@@ -49,7 +49,6 @@ create_log_user(){
oblog "add ${NEWUSER} at log group"
gpasswd -a "$NEWUSER" log
}
custo_once create_log_user
config_tree_boot(){
......@@ -136,6 +135,7 @@ config_enable_base_user(){
su "${NEWUSER}" -c "66-enable -zv3 xdg-user-dirs dbus-session@${NEWUSER}" || die "unable to enable xdg-user-dirs dbus-session@${NEWUSER} service"
}
custo_once create_log_user
custo_once config_tree_boot
custo_once config_enable_boot
custo_once config_tree_root
......@@ -145,60 +145,6 @@ custo_once config_enable_boot_user
custo_once config_tree_base_user
custo_once config_enable_base_user
config_66(){
oblog "Create tree boot"
66-tree -zv3 -n boot || die "unable to create boot tree"
oblog "Enable boot@system service at tree boot"
66-enable -zv3 -t boot -C -F boot@system || die "unable to enable boot@system"
## this is a little ugly, 66-env -r works properly but remove comment
## inside the configuration file. It can be confusing to a new user
## to not have the comments.
## So, first find the current version of the configuration file and use
## the classic sed command instead of 66-env.
BOOT_CONF="$(readlink /etc/66/conf/boot@system/version)"
BOOT_CONF="${BOOT_CONF}/boot@system"
oblog "Configure boot@system service"
sed -i "s:^HOSTNAME.*$:HOSTNAME=\!${HOSTNAME}:" ${BOOT_CONF} || die "unable to set HOSTANME"
sed -i "s:^KEYMAP.*$:KEYMAP=\!${KEYMAP}:" ${BOOT_CONF} || die "unable to set KEYMAP"
sed -i "s:^TZ.*$:TZ=${ZONE}/${SUBZONE}:" ${BOOT_CONF} || die "unable to set TZ"
oblog "Apply change to the boot@system service"
66-enable -zv3 -t boot -F boot@system || die "unable to apply boot changes"
oblog "Create tree root, enables and make it current"
66-tree -zv3 -Ecn root || die "unable to create root tree"
oblog "Enable dbus, openntpd, connmand and wpa_supplicant on tree root"
66-enable -zv3 sddm consolekit dbus openntpd networkmanager wpa_supplicant || die "unable to enable dbus openntpd connmand wpa_supplicant"
oblog "Create tree ${NEWUSER}-session for ${NEWUSER} user"
66-tree -zv3 -En ${NEWUSER}-session || die "unable to create ${NEWUSER}-session tree"
oblog "Enable boot-user@${NEWUSER} at boot-user tree"
66-enable -zv3 -t ${NEWUSER}-session -C -F boot-user@${NEWUSER} || die "unable to enable boot-user@${NEWUSER} service"
BOOT_USER="$(readlink /etc/66/conf/boot-user@${NEWUSER}/version)"
BOOT_USER="${BOOT_USER}/boot-user@${NEWUSER}"
oblog "Configure boot-user@${NEWUSER} service"
sed -i "s:^DESKTOP_CMDLINE.*$:DESKTOP_CMDLINE=\!xfce4-session:" ${BOOT_USER} || die "unable to set DESKTOP_CMDLINE"
oblog "Apply change to the boot-user@{NEWUSER} service"
66-enable -zv3 -t ${NEWUSER}-session -F boot-user@${NEWUSER} || die "unable to apply ${NEWUSER}-session changes"
oblog "Create tree graphics for ${NEWUSER}, enables and makes it current"
su "${NEWUSER}" -c "66-tree -zv3 -Ecn graphics" || die "unable to create graphics tree"
oblog "Enable xdg-user-dirs, dbus-session@${NEWUSER} on tree graphics"
su "${NEWUSER}" -c "66-enable -zv3 xdg-user-dirs dbus-session@${NEWUSER}" || die "unable to enable xdg-user-dirs dbus-session@${NEWUSER} service"
}
custo_once config_66
## Configure pulseaudio
config_pulse(){
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment