From: Paul Hänsch Date: Fri, 15 Nov 2019 21:49:54 +0000 (+0100) Subject: integrating changes from master X-Git-Url: https://git.plutz.net/?a=commitdiff_plain;h=fd7f1c1a3140e02c2716cd54a08e1f4c5220aca5;p=blast integrating changes from master --- diff --git a/Makefile b/Makefile index 274d1c7..b683f13 100644 --- 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 6a1907a..7c3133f 100644 --- 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 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