← Back to branch summary

~elementary-os/elementaryos/os-patch-ubiquity-xenial

« back to all changes in this revision

Viewing changes to d-i/source/netcfg/finish-install.d/55netcfg-copy-config

  • Committer: Cody Garver
  • Date: 2017-11-27 18:30:58 UTC
  • mfrom: (1.1.26 ubiquity-xenial)
  • Revision ID: cody@elementary.io-20171127183058-vv3tjna233x7pagc
Merge in lp:~elementary-os/ubuntu-package-imports/ubiquity-xenial and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
d-i/source/netcfg/finish-install.d/55netcfg-copy-config
43
43
        if $NM_IS_INSTALLED; then
44
44
                db_set netcfg/target_network_config $CONFIG_NM
45
45
        else
46
 
                if [ "$NETCFG_CONNECTION_TYPE" = "wired" ]; then
 
46
                if [ "$NETCFG_CONNECTION_TYPE" = "wireless" ]; then
 
47
                        db_set netcfg/target_network_config $CONFIG_LOOPBACK
 
48
                else # vlan/wired
47
49
                        db_set netcfg/target_network_config $CONFIG_INTERFACES
48
 
                else # wireless
49
 
                        db_set netcfg/target_network_config $CONFIG_LOOPBACK
50
50
                fi
51
51
        fi
52
52
fi