fix illegal option for TUI-based script; fake DHCP for jclone

olevole · Mar 11, 2016 · 0cbfad7 · 0cbfad7
1 parent e0c0294
commit 0cbfad7
Show file tree

Hide file tree

Showing 35 changed files with 119 additions and 285 deletions.
diff --git a/bsdconfig.subr b/bsdconfig.subr
@@ -0,0 +1,10 @@
+BSDCFG_SHARE="/usr/share/bsdconfig"
+. $BSDCFG_SHARE/common.subr || exit 1
+#f_dprintf "%s: loading includes..." "$0"
+f_include $BSDCFG_SHARE/dialog.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
+BSDCFG_LIBE="/usr/local/libexec/bsdconfig" APP_DIR="cbsd"
+
+ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
+[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+
diff --git a/jailctl/bcontrol-tui b/jailctl/bcontrol-tui
@@ -11,13 +11,14 @@ set -e
 set +e
 
 . ${subr}
-. ${dialog}
 . ${strings}
 . ${tools}
 
 [ -z "${1}" ] && select_jail_by_list -s "List of local VMs:" -r 0 -e bls
 init $*
 
+. ${dialog}
+
 dialog_menu_main()
 {
 	repo=0 # flags for execution jsetup-tui from repo get image

diff --git a/jailctl/border-tui b/jailctl/border-tui
@@ -6,12 +6,13 @@ MYDESC="Ncurses based VM order editor"
 EXTHELP="wf_jorder.html"
 
 . ${subr}
-. ${settingstui}
 . ${tools}
-. ${dialog}
 
 init $*
 
+. ${settingstui}
+. ${dialog}
+
 load_table()
 {
 	local jnum=0

diff --git a/jailctl/bsetup-tui b/jailctl/bsetup-tui
@@ -7,8 +7,6 @@ set -e
 set +e
 
 . ${subr}
-. ${settingstui}
-. ${dialog}
 . ${strings}
 . ${tools}
 
@@ -21,6 +19,9 @@ MYOPTARG="${JARG} outfile"
 
 init $*
 
+. ${settingstui}
+. ${dialog}
+
 commit()
 {
 	local _oldjname _newjname

diff --git a/jailctl/jclone b/jailctl/jclone
@@ -4,6 +4,7 @@ MYARG="old new host_hostname"
 MYOPTARG="ip4_addr verbose"
 MYDESC="Jail cloning"
 CBSDMODULE="jail"
+ADDHELP="ip4_addr - can be DHCP\n"
 
 . ${subr}
 . ${tools}
@@ -20,6 +21,18 @@ myjid=$( cbsdsql local SELECT jid FROM jails WHERE jname=\"${new}\" 2>/dev/null
 [ -n "${myjid}" ] && err 1 "${MAGENTA}Jail already exist: ${GREEN}${new}${NORMAL}"
 
 jname="${old}"
+
+if [ "${ip4_addr}" = "DHCP" ]; then
+	dhcpip=$( dhcpd )
+	[ -z "${dhcpip}" ] && err 1 "${MAGENTA}Unable to dhcpd${NORMAL}"
+	ipwmask ${dhcpip}
+	[ -z "${IWM}" ] && err 1 "${MAGENTA}Unable IWM for dhcpd${NORMAL}"
+	iptype ${IWM}
+	[ $? -eq 0 ] && err 1 "${MAGENTA}Not ip from dhcpd?: ${dhcpip} / ${IWM}"
+	ip4_addr="${dhcpip}"
+	${ECHO} "${MAGENTA}Selected IP: ${GREEN}${ip4_addr}${NORMAL}"
+fi
+
 ip4_addr_new="${ip4_addr}"
 host_hostname_new="${host_hostname}"
 

diff --git a/jailctl/jcontrol-tui b/jailctl/jcontrol-tui
@@ -11,13 +11,14 @@ set -e
 set +e
 
 . ${subr}
-. ${dialog}
 . ${strings}
 . ${tools}
 
 [ -z "${1}" ] && select_jail_by_list -s "List of local jails:" -r 0
 init $*
 
+. ${dialog}
+
 dialog_menu_main()
 {
 	repo=0 # flags for execution jsetup-tui from repo get image

diff --git a/jailctl/jorder-tui b/jailctl/jorder-tui
@@ -6,12 +6,14 @@ MYDESC="Ncurses based jail order editor"
 EXTHELP="wf_jorder.html"
 
 . ${subr}
-. ${settingstui}
 . ${tools}
-. ${dialog}
 
 init $*
 
+. ${settingstui}
+. ${dialog}
+
+
 load_table()
 {
 	local jnum=0

diff --git a/jailctl/jrctl-tui b/jailctl/jrctl-tui
@@ -6,7 +6,6 @@ MYOPTARG=""
 MYDESC="Dialog based UI for RACCR/RCTL"
 
 . ${subr}
-. ${dialog}
 . ${strings}
 . ${tools}
 . ${sharedir}/rctl.conf
@@ -15,6 +14,8 @@ MYDESC="Dialog based UI for RACCR/RCTL"
 [ -z "${1}" ] && select_jail_by_list -s "List of local jails:" -r 0
 init $*
 
+. ${dialog}
+
 . ${jrcconf}
 [ $? -eq 1 ] && err 1 "${MAGENTA}No such jail: ${GREEN}${jname}${NORMAL}"
 

diff --git a/jailctl/jsetup-tui b/jailctl/jsetup-tui
@@ -1,8 +1,6 @@
 #!/usr/local/bin/cbsd
 #v10.1.4
 . ${subr}
-. ${settingstui}
-. ${dialog}
 . ${strings}
 . ${tools}
 
@@ -15,6 +13,10 @@ MYOPTARG="${JARG} outfile"
 
 init $*
 
+. ${settingstui}
+. ${dialog}
+
+
 commit()
 {
 	local _oldjname _newjname

diff --git a/modules/bsdconf.d/adduser-tui b/modules/bsdconf.d/adduser-tui
@@ -5,11 +5,12 @@ MYDESC="Ncurses based dialog for jcreate"
 CBSDMODULE="bsdconf"
 
 . ${subr}
-. ${settingstui}
 . ${tools}
-. ${dialog}
 init $*
 
+. ${settingstui}
+. ${dialog}
+
 f_include $BSDCFG_SHARE/strings.subr
 f_include $BSDCFG_SHARE/usermgmt/group_input.subr
 f_include $BSDCFG_SHARE/usermgmt/user_input.subr

diff --git a/share/bsdconfig/cbsd/basecfg b/share/bsdconfig/cbsd/basecfg
@@ -1,18 +1,4 @@
 #!/usr/local/bin/cbsd
-############################################################ INCLUDES
-
-BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_SHARE/common.subr || exit 1
-f_dprintf "%s: loading includes..." "$0"
-f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_SHARE/mustberoot.subr
-
-BSDCFG_LIBE="/usr/local/libexec/bsdconfig" APP_DIR="cbsd"
-f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
-
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
-
 . ${subr}
 . ${strings}
 . ${tools}
@@ -96,6 +82,11 @@ dialog_menu_main()
 ############################################################ MAIN
 export NOCOLOR=1
 
+init $*
+f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
+. ${workdir}/bsdconfig.subr
+
+
 # Incorporate rc-file if it exists
 [ -f "$HOME/.bsdconfigrc" ] && f_include "$HOME/.bsdconfigrc"
 

diff --git a/share/bsdconfig/cbsd/bhyvecfg b/share/bsdconfig/cbsd/bhyvecfg
@@ -1,17 +1,4 @@
 #!/usr/local/bin/cbsd
-############################################################ INCLUDES
-
-BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_SHARE/common.subr || exit 1
-f_dprintf "%s: loading includes..." "$0"
-f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_SHARE/mustberoot.subr
-
-BSDCFG_LIBE="/usr/local/libexec/bsdconfig" APP_DIR="cbsd"
-f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
-
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
 
 . ${subr}
 . ${strings}
@@ -96,6 +83,9 @@ dialog_menu_main()
 ############################################################ MAIN
 export NOCOLOR=1
 
+. ${workdir}/bsdconfig.subr
+f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
+
 # Incorporate rc-file if it exists
 [ -f "$HOME/.bsdconfigrc" ] && f_include "$HOME/.bsdconfigrc"
 

diff --git a/share/bsdconfig/cbsd/bhyvedsk b/share/bsdconfig/cbsd/bhyvedsk
@@ -1,20 +1,4 @@
 #!/usr/local/bin/cbsd
-############################################################ INCLUDES
-
-BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_SHARE/common.subr || exit 1
-f_dprintf "%s: loading includes..." "$0"
-f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_SHARE/mustberoot.subr
-
-BSDCFG_LIBE="/usr/local/libexec/bsdconfig" APP_DIR="cbsd"
-f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages-bhyvedsk.subr
-
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
-
-############################################################ FUNCTIONS
-
 # dialog_menu_main
 #
 # Display the dialog(1)-based application main menu.
@@ -126,6 +110,9 @@ set +e
 . ${tools}
 init $*
 
+. ${workdir}/bsdconfig.subr
+f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages-bhyvedsk.subr
+
 . ${jrcconf}
 [ $? -eq 1 ] && err 1 "${MAGENTA}No such VM: ${GREEN}${jname}${NORMAL}"
 [ "${emulator}" != "bhyve" ] && err 1 "${MAGENTA}Not in bhyve mode${NORMAL}"

diff --git a/share/bsdconfig/cbsd/bhyvedsk-cfgdsk b/share/bsdconfig/cbsd/bhyvedsk-cfgdsk
@@ -1,17 +1,4 @@
 #!/usr/local/bin/cbsd
-############################################################ INCLUDES
-
-BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_SHARE/common.subr || exit 1
-f_dprintf "%s: loading includes..." "$0"
-f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_SHARE/mustberoot.subr
-
-BSDCFG_LIBE="/usr/local/libexec/bsdconfig" APP_DIR="cbsd"
-f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages-bhyvedsk.subr
-
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
 
 . ${subr}
 . ${strings}
@@ -110,6 +97,9 @@ set +e
 . ${tools}
 init $*
 
+. ${workdir}/bsdconfig.subr
+f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages-bhyvedsk.subr
+
 . ${jrcconf}
 [ $? -eq 1 ] && err 1 "${MAGENTA}No such VM: ${GREEN}${jname}${NORMAL}"
 [ "${emulator}" != "bhyve" ] && err 1 "${MAGENTA}Not in bhyve mode${NORMAL}"

diff --git a/share/bsdconfig/cbsd/bhyvedsk-newdsk b/share/bsdconfig/cbsd/bhyvedsk-newdsk
@@ -1,24 +1,8 @@
 #!/usr/local/bin/cbsd
-############################################################ INCLUDES
-
-BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_SHARE/common.subr || exit 1
-f_dprintf "%s: loading includes..." "$0"
-f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_SHARE/mustberoot.subr
-
-BSDCFG_LIBE="/usr/local/libexec/bsdconfig" APP_DIR="cbsd"
-f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages-bhyvedsk.subr
-
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
-
 . ${subr}
 . ${strings}
 . ${tools}
 
-############################################################ FUNCTIONS
-
 # dialog_menu_main
 #
 # Display the dialog(1)-based application main menu.
@@ -99,6 +83,9 @@ set +e
 . ${tools}
 init $*
 
+. ${workdir}/bsdconfig.subr
+f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages-bhyvedsk.subr
+
 . ${jrcconf}
 [ $? -eq 1 ] && err 1 "${MAGENTA}No such VM: ${GREEN}${jname}${NORMAL}"
 [ "${emulator}" != "bhyve" ] && err 1 "${MAGENTA}Not in bhyve mode${NORMAL}"

diff --git a/share/bsdconfig/cbsd/bhyvenic b/share/bsdconfig/cbsd/bhyvenic
@@ -1,19 +1,4 @@
 #!/usr/local/bin/cbsd
-############################################################ INCLUDES
-
-BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_SHARE/common.subr || exit 1
-f_dprintf "%s: loading includes..." "$0"
-f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_SHARE/mustberoot.subr
-
-BSDCFG_LIBE="/usr/local/libexec/bsdconfig" APP_DIR="cbsd"
-f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages-bhyvenic.subr
-
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
-
-############################################################ FUNCTIONS
 
 # dialog_menu_main
 #
@@ -120,6 +105,10 @@ set +e
 . ${vimageconf}
 init $*
 
+. ${workdir}/bsdconfig.subr
+f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages-bhyvenic.subr
+
+
 . ${jrcconf}
 [ $? -eq 1 ] && err 1 "${MAGENTA}No such VM: ${GREEN}${jname}${NORMAL}"
 [ "${emulator}" != "bhyve" ] && err 1 "${MAGENTA}Not in bhyve mode${NORMAL}"

diff --git a/share/bsdconfig/cbsd/bhyvenic-cfgnic b/share/bsdconfig/cbsd/bhyvenic-cfgnic
@@ -1,25 +1,9 @@
 #!/usr/local/bin/cbsd
-############################################################ INCLUDES
-
 . ${subr}
 . ${tools}
 . ${dialog}
 . ${strings}
 
-BSDCFG_SHARE="/usr/share/bsdconfig"
-. $BSDCFG_SHARE/common.subr || exit 1
-f_dprintf "%s: loading includes..." "$0"
-f_include $BSDCFG_SHARE/dialog.subr
-f_include $BSDCFG_SHARE/mustberoot.subr
-
-BSDCFG_LIBE="/usr/local/libexec/bsdconfig" APP_DIR="cbsd"
-f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages-bhyvenic.subr
-
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
-
-############################################################ FUNCTIONS
-
 # dialog_menu_main
 #
 # Display the dialog(1)-based application main menu.
@@ -112,6 +96,9 @@ set +e
 . ${vimageconf}
 init $*
 
+. ${workdir}/bsdconfig.subr
+f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages-bhyvenic.subr
+
 . ${jrcconf}
 [ $? -eq 1 ] && err 1 "${MAGENTA}No such VM: ${GREEN}${jname}${NORMAL}"
 [ "${emulator}" != "bhyve" ] && err 1 "${MAGENTA}Not in bhyve mode${NORMAL}"