Moves root password into default-config, adds .nix suffix

flicaflow · flicaflow · commit 3fe37112d75b · 2018-07-11T08:59:34.000+02:00
diff --git a/default-extra-config.nix b/default-extra-config.nix
@@ -1 +1,2 @@
 services.openssh.permitRootLogin = "yes";
+users.extraUsers.root.password = "nixos";
diff --git a/install b/install
@@ -60,7 +60,7 @@ checksum=$minimal_checksum
 minimal_space=3
 graphical_space=5
 required_space=$minimal_space
-extra_config=$(readlink -f default-extra-config)
+extra_config=$(readlink -f default-extra-config.nix)
 digitalocean=false
 
 while getopts ":g:r:t:Gdw:c:h" opt; do
diff --git a/stage2 b/stage2
@@ -70,7 +70,6 @@ cat <<EOF > /nixos/etc/nixos/nixos-in-place.nix
       fsType = "$root_type";
     };
   };
-  users.extraUsers.root.password = "nixos";
   $digitalocean_configs
   $(cat /nixos/extra-config)
 }

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`services.openssh.permitRootLogin = "yes";`
	`2`	`+users.extraUsers.root.password = "nixos";`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,6 @@ cat <<EOF > /nixos/etc/nixos/nixos-in-place.nix`
`70`	`70`	`fsType = "$root_type";`
`71`	`71`	`};`
`72`	`72`	`};`
`73`		`- users.extraUsers.root.password = "nixos";`
`74`	`73`	`$digitalocean_configs`
`75`	`74`	`$(cat /nixos/extra-config)`
`76`	`75`	`}`