diff --git a/build.sh b/build.sh index 4b8022eb..3a8e90b4 100755 --- a/build.sh +++ b/build.sh @@ -1354,8 +1354,8 @@ EOF fi # Keep a real hostname so startx/xauth do not derive invalid display names # such as bare :0 or /unix:0 on the installer-derived "Amnesiac" profile. - set_config_line "${MOUNT_POINT}/etc/rc.conf" 'hostname="clawdie-live"' - if ! grep -Eq '^hostname="clawdie-live"' "${MOUNT_POINT}/etc/rc.conf"; then + set_config_line "${MOUNT_POINT}/etc/rc.conf" 'hostname="usb.clawdie.home.arpa"' + if ! grep -Eq '^hostname="usb.clawdie.home.arpa"' "${MOUNT_POINT}/etc/rc.conf"; then echo "ERROR: live USB hostname is not configured in /etc/rc.conf" exit 1 fi @@ -1401,12 +1401,11 @@ EOF # hidbus / iichid — HID-over-I²C bridge for modern touchpads / keyboards. # hms / hmt / hkbd — HID mouse / multitouch / keyboard class drivers. # acpi_video — backlight control sysctls (hw.acpi.video.lcd0.brightness). - # acpi_asus / acpi_asus_wmi — ASUS-laptop fn-keys, hotkeys, fan control. No-op on non-ASUS hardware. append_rc_list_values "${MOUNT_POINT}/etc/rc.conf" kld_list \ linux linux64 zfs \ cuse \ hidbus iichid hms hmt hkbd \ - acpi_video acpi_asus acpi_asus_wmi + acpi_video mkdir -p "${MOUNT_POINT}/etc/ssh/sshd_config.d" install -m 0644 "${LIVE_SESSION_DIR}/sshd-live.conf" \ @@ -1542,7 +1541,7 @@ EOF mkdir -p "${MOUNT_POINT}/usr/local/etc/xdg/xfce4/xfconf/xfce-perchannel-xml" cp "${PANEL_SKEL}/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml" \ "${MOUNT_POINT}/usr/local/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml" - for _xfconf_xml in xsettings.xml xfwm4.xml xfce4-desktop.xml xfce4-power-manager.xml; do + for _xfconf_xml in xsettings.xml xfwm4.xml xfce4-desktop.xml xfce4-power-manager.xml displays.xml; do if [ -f "${PANEL_SKEL}/.config/xfce4/xfconf/xfce-perchannel-xml/${_xfconf_xml}" ]; then cp "${PANEL_SKEL}/.config/xfce4/xfconf/xfce-perchannel-xml/${_xfconf_xml}" \ "${MOUNT_POINT}/usr/local/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/${_xfconf_xml}" diff --git a/live/operator-session/panel-skel/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml b/live/operator-session/panel-skel/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml new file mode 100644 index 00000000..19feeacf --- /dev/null +++ b/live/operator-session/panel-skel/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/live/operator-session/panel-skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/live/operator-session/panel-skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml index 3a7d1bef..73293f57 100644 --- a/live/operator-session/panel-skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml +++ b/live/operator-session/panel-skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml @@ -7,12 +7,34 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/live/operator-session/panel-skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/live/operator-session/panel-skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml index f72b2894..58eba59e 100644 --- a/live/operator-session/panel-skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml +++ b/live/operator-session/panel-skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml @@ -40,6 +40,7 @@ + @@ -93,13 +94,13 @@ - + - +