equal
deleted
inserted
replaced
136 define_opt guest_disk /dev/vda |
136 define_opt guest_disk /dev/vda |
137 define_opt hostname $opt_name |
137 define_opt hostname $opt_name |
138 define_opt bridge br-lan |
138 define_opt bridge br-lan |
139 define_opt domain paivola.fi |
139 define_opt domain paivola.fi |
140 define_opt ip |
140 define_opt ip |
|
141 define_opt user $USER |
141 define_opt puppet |
142 define_opt puppet |
142 define_opt puppet_master puppet |
143 define_opt puppet_master puppet |
143 define_opt serial_console |
144 define_opt serial_console |
144 |
145 |
145 log_info "Processing ${#@} parameters:" |
146 log_info "Processing ${#@} parameters:" |
242 echo -n "Install target login ($USER_NAME) " >&2 |
243 echo -n "Install target login ($USER_NAME) " >&2 |
243 mkpasswd -m sha-512 |
244 mkpasswd -m sha-512 |
244 fi |
245 fi |
245 } |
246 } |
246 |
247 |
247 # XXX: hardcoded |
248 # per opt |
248 USER_CREATE='true' |
249 case x"$opt_user" in |
249 USER_NAME=$USER |
250 x) |
250 USER_FULLNAME=$(user_fullname $USER) |
251 log_info "user: Skipping user account creation" |
251 USER_SHADOW=$(user_shadow $USER) |
252 |
|
253 USER_CREATE='false' |
|
254 USER_NAME= |
|
255 USER_FULLNAME= |
|
256 USER_SHADOW= |
|
257 |
|
258 ;; |
|
259 |
|
260 x*) |
|
261 log_info "user: With username=${opt_user}" |
|
262 |
|
263 USER_CREATE='true' |
|
264 USER_NAME=$opt_user |
|
265 USER_FULLNAME=$(user_fullname $opt_user) |
|
266 USER_SHADOW=$(user_shadow $opt_user) |
|
267 |
|
268 ;; |
|
269 esac |
|
270 |
252 USER_GROUPS=( cdrom sudo adm ) |
271 USER_GROUPS=( cdrom sudo adm ) |
253 |
272 |
254 ### Installer setup |
273 ### Installer setup |
255 ## Installation image |
274 ## Installation image |
256 # Original Debian Installer image (iso) |
275 # Original Debian Installer image (iso) |