--- a/pkvlm-create	Mon Jan 30 13:35:12 2012 +0200
+++ b/pkvlm-create	Mon Jan 30 13:41:24 2012 +0200
@@ -138,6 +138,7 @@
 define_opt  bridge      br-lan
 define_opt  domain      paivola.fi
 define_opt  ip          
+define_opt  user        $USER
 define_opt  puppet      
 define_opt  puppet_master   puppet
 define_opt  serial_console
@@ -244,11 +245,29 @@
     fi
 }
 
-# XXX: hardcoded
-USER_CREATE='true'
-USER_NAME=$USER
-USER_FULLNAME=$(user_fullname $USER)
-USER_SHADOW=$(user_shadow $USER)
+# per opt
+case x"$opt_user" in
+    x) 
+        log_info "user: Skipping user account creation"
+
+        USER_CREATE='false'
+        USER_NAME=
+        USER_FULLNAME=
+        USER_SHADOW=
+        
+        ;;
+
+    x*)
+        log_info "user: With username=${opt_user}"
+
+        USER_CREATE='true'
+        USER_NAME=$opt_user
+        USER_FULLNAME=$(user_fullname $opt_user)
+        USER_SHADOW=$(user_shadow $opt_user)
+
+        ;;
+esac
+        
 USER_GROUPS=( cdrom sudo adm )
 
 ### Installer setup