diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2008-11-01 19:36:05 +0100 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2008-11-01 19:36:05 +0100 |
| commit | a95bfb1aaa4cf05dbb92a409f9a5ea8db720c98d (patch) | |
| tree | 208593a33fd1546e79daeac65e8feaa032852aa1 /src/profiles | |
| parent | ad4447e651202c1e3ba0b665e40269fe345e9bc0 (diff) | |
var_TARGET_DIR and various other fixes
Diffstat (limited to 'src/profiles')
| -rw-r--r-- | src/profiles/profile-dieter | 10 | ||||
| -rw-r--r-- | src/profiles/profile-interactive-DRAFT.sh | 12 |
2 files changed, 17 insertions, 5 deletions
diff --git a/src/profiles/profile-dieter b/src/profiles/profile-dieter index 2776ff5..6574eb0 100644 --- a/src/profiles/profile-dieter +++ b/src/profiles/profile-dieter @@ -43,10 +43,10 @@ EOF lvcreate -L 10G -n home cryptpool lvcreate -L 10G -n root cryptpool lvcreate -L 3G -n var cryptpool - mke2fs -j /dev/cryptpool/home && mount /dev/cryptpool/home $TARGET_DIR/home - mke2fs -j /dev/cryptpool/root - mke2fs -j /dev/cryptpool/tmp - mke2fs -j /dev/cryptpool/var + for i in home root tmp var + do + mke2fs -j /dev/cryptpool/$i && mount /dev/cryptpool/$i $var_TARGET_DIR/$i + done #TODO fstab? auto-add to fstab with libs? auto mkdir's on target_dir? true @@ -74,7 +74,7 @@ worker_install_bootloader () _accept_ssl_cert () { mkdir -p /root/.subversion/auth/svn.ssl.server - cat /root/.subversion/auth/svn.ssl.server/1123d3c8b27895efee3848cc779e526a << EOF + cat > /root/.subversion/auth/svn.ssl.server/1123d3c8b27895efee3848cc779e526a << EOF K 10 ascii_cert V 716 diff --git a/src/profiles/profile-interactive-DRAFT.sh b/src/profiles/profile-interactive-DRAFT.sh index b7644e3..b7f5a68 100644 --- a/src/profiles/profile-interactive-DRAFT.sh +++ b/src/profiles/profile-interactive-DRAFT.sh @@ -803,6 +803,18 @@ EOF S_GRUB=1 } + + # exit if network wasn't configured in installer + if [ $S_NET -eq 0 ]; then + return 1 + fi + + ask_yesno "Do you want to use the network settings from the installer in rc.conf and resolv.conf?\n\nIf you used Proxy settings, they will be written to /etc/profile.d/proxy.sh" || return 1 + + if [ $S_DHCP -ne 1 ]; then + auto_network +fi + ##################### ## begin execution ## |