Merge branch 'master' of a.gmvl.de:/git/m1-debian

diff --git a/bootstrap.sh b/bootstrap.sh
index 2c5d1e920864a52274b53f710dbe6d4634f4bb18..408dedcd58e895643b1360ce0c9c576caafe4a7d 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -75,7 +75,7 @@ build_rootfs()
 
         sudo mkdir -p boot/efi
 
-        sudo bash -c 'echo live > etc/hostname'
+        sudo bash -c 'echo debian > etc/hostname'
 
         sudo bash -c 'echo > etc/motd'
 

diff --git a/files/hosts b/files/hosts
index 0328b5c4fc1664b32a534652defc5989c6e8e05e..002fbb67d5ab5e27072ade04163acd2d4be4a1c1 100644 (file)
--- a/files/hosts
+++ b/files/hosts
@@ -1 +1 @@
-127.0.0.1 localhost live
+127.0.0.1 localhost debian

diff --git a/files/interfaces b/files/interfaces
index 5fbb36d26da398cbb472025d8516a10c0765d8b1..9eb2f142ccbf7cc897f0b1643e02b03e23a9510c 100644 (file)
--- a/files/interfaces
+++ b/files/interfaces
@@ -5,6 +5,6 @@ source /etc/network/interfaces.d/*
 allow-hotplug enp3s0
 iface enp3s0 inet dhcp
 
-allow-hotplug wlp1s0f0
+# allow-hotplug wlp1s0f0
 iface wlp1s0f0 inet dhcp
         wpa-conf /etc/wpa_supplicant/wpa_supplicant.conf