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

fix .xsession script

parent cc60701c
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
jwm/customizeChroot
+ 0
− 6
View file @ 5d884b8f
......@@ -78,12 +78,6 @@ config_enable_boot(){
66-enable -zv3 -t boot -F boot@system || die "unable to enable boot@system"
# By default the configuration file is prefixed with a dot.
# 66-env -r do not know about it, so copy it without the prefix
BOOT_CONF="$(readlink /etc/66/conf/boot@system/version)"
cp "${BOOT_CONF}/.boot@system" "${BOOT_CONF}/boot@system" || die "unable to cp boot@system configuration file"
oblog "Configure boot@system service"
66-env -t boot -r "HOSTNAME=!${HOSTNAME}" -r "KEYMAP=!${KEYMAP}" -r "TZ=${ZONE}/${SUBZONE}" boot@system || die "unable to configure boot@system service"
......
minimal/customizeChroot
+ 0
− 6
View file @ 5d884b8f
......@@ -78,12 +78,6 @@ config_enable_boot(){
66-enable -zv3 -t boot -F boot@system || die "unable to enable boot@system"
# By default the configuration file is prefixed with a dot.
# 66-env -r do not know about it, so copy it without the prefix
BOOT_CONF="$(readlink /etc/66/conf/boot@system/version)"
cp "${BOOT_CONF}/.boot@system" "${BOOT_CONF}/boot@system" || die "unable to cp boot@system configuration file"
oblog "Configure boot@system service"
66-env -t boot -r "HOSTNAME=!${HOSTNAME}" -r "KEYMAP=!${KEYMAP}" -r "TZ=${ZONE}/${SUBZONE}" boot@system || die "unable to configure boot@system service"
......
openbox/customizeChroot
+ 0
− 10
View file @ 5d884b8f
......@@ -78,12 +78,6 @@ config_enable_boot(){
66-enable -zv3 -t boot -F boot@system || die "unable to enable boot@system"
# By default the configuration file is prefixed with a dot.
# 66-env -r do not know about it, so copy it without the prefix
BOOT_CONF="$(readlink /etc/66/conf/boot@system/version)"
cp "${BOOT_CONF}/.boot@system" "${BOOT_CONF}/boot@system" || die "unable to cp boot@system configuration file"
oblog "Configure boot@system service"
66-env -t boot -r "HOSTNAME=!${HOSTNAME}" -r "KEYMAP=!${KEYMAP}" -r "TZ=${ZONE}/${SUBZONE}" || die "unable to configure boot@system service"
......@@ -126,10 +120,6 @@ config_enable_boot_user(){
66-enable -zv3 -t boot-user -F boot-user@${NEWUSER} || die "unable to enable boot-user@${NEWUSER} service"
BOOT_USER="$(readlink /etc/66/conf/boot-user@${NEWUSER}/version)"
cp "${BOOT_USER}/.boot-user@${NEWUSER}" "${BOOT_USER}/boot-user@${NEWUSER}"
oblog "Configure boot-user@${NEWUSER} service"
66-env -t boot-user -r "DESKTOP_CMDLINE=!openbox-session" boot-user@${NEWUSER} || die "unable to set DESKTOP_CMDLINE"
......
plasma/customizeChroot
+ 2
− 12
View file @ 5d884b8f
......@@ -91,12 +91,6 @@ config_enable_boot(){
out_progress "Done"
#sleep 1
# By default the configuration file is prefixed with a dot.
# 66-env -r do not know about it, so copy it without the prefix
BOOT_CONF="$(readlink /etc/66/conf/boot@system/version)"
cp "${BOOT_CONF}/.boot@system" "${BOOT_CONF}/boot@system" || die "unable to cp boot@system configuration file"
oblog "Configure (boot@system) service"
out_progress "Starting ..."
......@@ -158,10 +152,6 @@ config_enable_boot_user(){
out_progress "Done"
#sleep 1
BOOT_USER="$(readlink /etc/66/conf/boot-user@${NEWUSER}/version)"
cp "${BOOT_USER}/.boot-user@${NEWUSER}" "${BOOT_USER}/boot-user@${NEWUSER}"
oblog "Configure (boot-user@${NEWUSER}) service"
out_progress "Starting ..."
......@@ -227,9 +217,9 @@ config_enable_base_user(){
config_xsession(){
cat << EOF > /home/${NEWUSER}/.xsession
list=( \$(ls -1 /home/${NEWUSER}/.66/conf/svscan@${NEWUSER}) )
list=( \$(ls -A1 /home/${NEWUSER}/.66/conf/svscan@${NEWUSER}) )
for i in \${list[@]};do
var=\$(</home/${NEWUSER}/.66/conf/svscan@${NEWUSER}/\${i})
var=( \$(</home/${NEWUSER}/.66/conf/svscan@${NEWUSER}/\${i}) )
for j in \${var[@]}; do
export \${j}
done
......
xfce4/customizeChroot
+ 2
− 12
View file @ 5d884b8f
......@@ -78,12 +78,6 @@ config_enable_boot(){
66-enable -zv3 -t boot -F boot@system || die "unable to enable boot@system"
# By default the configuration file is prefixed with a dot.
# 66-env -r do not know about it, so copy it without the prefix
BOOT_CONF="$(readlink /etc/66/conf/boot@system/version)"
cp "${BOOT_CONF}/.boot@system" "${BOOT_CONF}/boot@system" || die "unable to cp boot@system configuration file"
oblog "Configure boot@system service"
66-env -t boot -r "HOSTNAME=!${HOSTNAME}" -r "KEYMAP=!${KEYMAP}" -r "TZ=${ZONE}/${SUBZONE}" boot@system || die "unable to configure boot@system service"
......@@ -126,10 +120,6 @@ config_enable_boot_user(){
66-enable -zv3 -t boot-user -F boot-user@${NEWUSER} || die "unable to enable boot-user@${NEWUSER} service"
BOOT_USER="$(readlink /etc/66/conf/boot-user@${NEWUSER}/version)"
cp "${BOOT_USER}/.boot-user@${NEWUSER}" "${BOOT_USER}/boot-user@${NEWUSER}"
oblog "Configure boot-user@${NEWUSER} service"
66-env -t boot-user -r "DESKTOP_CMDLINE=!xfce4-session" boot-user@${NEWUSER} || die "unable to set DESKTOP_CMDLINE"
......@@ -157,9 +147,9 @@ config_enable_base_user(){
config_xsession(){
cat << EOF > /home/${NEWUSER}/.xsession
list=( \$(ls -1 /home/${NEWUSER}/.66/conf/svscan@${NEWUSER}) )
list=( \$(ls -A1 /home/${NEWUSER}/.66/conf/svscan@${NEWUSER}) )
for i in \${list[@]};do
var=\$(</home/${NEWUSER}/.66/conf/svscan@${NEWUSER}/\${i})
var=( \$(</home/${NEWUSER}/.66/conf/svscan@${NEWUSER}/\${i}) )
for j in \${var[@]}; do
export \${j}
done
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment