6543/remaster
6543/remaster
1
1
Fork 0
Code Issues 15 Pull Requests Releases 5 Activity

Merge branch 'feature-proxy-optional' into develop

Browse Source
This commit is contained in:
6543 2018-05-20 14:15:24 +02:00
commit 6bb0f2ab06
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/remaster.sh
View File

@ -113,9 +113,10 @@ function main_renew() {
error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file" error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"


# 5. Setzen der Netzwerk-Einstellungen: # 5. Setzen der Netzwerk-Einstellungen:

[ -n "$proxy_host" ] && {
proxy_enable$distro "$chroot_path" "$proxy_host" "$proxy_port" >> "$log_file" proxy_enable$distro "$chroot_path" "$proxy_host" "$proxy_port" >> "$log_file"
error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file" error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
}


dns_set "$chroot_path" "$domain" "$nameserver" >> "$log_file" dns_set "$chroot_path" "$domain" "$nameserver" >> "$log_file"
error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file" error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
@ -397,9 +398,10 @@ function main_update_iso() {
error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file" error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"


# 5. Setzen der Netzwerk-Einstellungen: # 5. Setzen der Netzwerk-Einstellungen:

[ -n "$proxy_host" ] && {
proxy_enable$distro "$chroot_path" "$proxy_host" "$proxy_port" >> "$log_file" proxy_enable$distro "$chroot_path" "$proxy_host" "$proxy_port" >> "$log_file"
error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file" error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"
}


dns_set "$chroot_path" "$domain" "$nameserver" >> "$log_file" dns_set "$chroot_path" "$domain" "$nameserver" >> "$log_file"
error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file" error_level="$?"; [ "$error_level" != "0" ] && on_exit $error_level >> "$log_file"