integrating changes from master

diff --git a/Makefile b/Makefile
index 274d1c7c79d35764edbc2b3dc630a0ed05979122..b683f13b895bf9a7a0050efac8ef05bf1e10995d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -415,7 +415,7 @@ endif
 
 _mount: _mount_root _mount_boot
 
-_img_mount:
+_img_mount: ${CFGROOT}
        mount -o loop,offset="$$((${BOOT_MB} + 2))"M,sizelimit=${ROOT_MB}M \
          -t ext4 "$${VOLUME}" "$${CFGROOT}"
        chmod 755 "$${CFGROOT}"

diff --git a/modules/default.mk b/modules/default.mk
index 6a1907a93cb6eaec01a4c278f4d69b3448bc4ff9..7c3133f913fa182f348e591fdc135ee282f21971 100644 (file)
--- a/modules/default.mk
+++ b/modules/default.mk
@@ -102,6 +102,7 @@ _users: ${CFGROOT}
 
 _hostname: ${CFGROOT}
        printf '%s\n' "$${hostname}" >"$${CFGROOT}/etc/hostname"
+       sed -Ei "s;^127\.0\.0\.1.*$$;&  $${hostname};" "$${CFGROOT}/etc/hosts"
 
 ifdef wifi
   _config: ${CFGROOT}/etc/network/interfaces.d/wifi

diff --git a/modules/xfce/etc/gtk-3.0/settings.ini b/modules/xfce/etc/gtk-3.0/settings.ini
new file mode 100644 (file)
index 0000000..8c395bc
--- /dev/null
+++ b/modules/xfce/etc/gtk-3.0/settings.ini
@@ -0,0 +1,2 @@
+[settings]
+gtk-print-preview-command = okular %f