revert a few changes that need more work

crschardt · Jul 29, 2024 · 35b5587 · 35b5587
1 parent 38e3836
commit 35b5587
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/OPi5_CIDATA/network-config b/OPi5_CIDATA/network-config
@@ -25,16 +25,11 @@ network:
       match:
         name: "en*"
       dhcp4: true
-      link-local: 
-      - ipv4 
-      networkmanager:
-        passthrough:
-          ipv4.dhcp-timeout: "2147483647"
-          ipv4.link-local: "3"
-          ipv6.method: "disabled"
-  #   zz-all-eth:
-  #     match:
-  #       name: "eth*"
-  #     dhcp4: true
-  #     optional: true
+      optional: true
+    zz-all-eth:
+      renderer: NetworkManager
+      match:
+        name: "eth*"
+      dhcp4: true
+      optional: true
 
diff --git a/OPi5_CIDATA/user-data b/OPi5_CIDATA/user-data
@@ -26,10 +26,10 @@ users:
 # On first boot, set the (default) ubuntu user's password to "ubuntu" and
 # expire user passwords
 chpasswd:
-  expire: false
+  expire: true
   users:
   - name: ubuntu
-    password: photon
+    password: ubuntu
     type: text
 
 ## Set the system's hostname. Please note that, unless you have a local DNS