Skip to content

Commit e62e101

Browse files
committed
fix: update argument check and improve WSL configuration in ubuntu-24.04-install.sh
1 parent 7673401 commit e62e101

1 file changed

Lines changed: 16 additions & 12 deletions

File tree

iotedge/ubuntu-24.04-install.sh

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ if [ "$EUID" -ne 0 ]; then
3434
exit 1
3535
fi
3636

37-
if [ "$#" -ne 1 ]; then
37+
if [ "$#" -lt 1 ]; then
3838
echo "Usage: $0 <iot-edge-device-connection-string>"
3939
exit 1
4040
fi
@@ -44,25 +44,29 @@ fi
4444
DEVICE_ID=$(echo "$1" | sed -n 's/.*DeviceId=\([^;]*\).*/\1/p')
4545
echo -e "${CYAN}*************** Device ID: $DEVICE_ID${NC}"
4646

47-
# Configure WSL if needed
48-
if ! grep -q "generateResolvConf" /etc/wsl.conf 2>/dev/null; then
49-
echo -e "${CYAN}*************** Configuring WSL settings${NC}"
50-
cat << EOF >> /etc/wsl.conf
47+
# if second parameter is --wsl-fix, apply WSL specific fixes
48+
if [ "$#" -eq 2 ] && [ "$2" == "--wsl-fix" ]; then
49+
echo -e "${CYAN}*************** Applying WSL specific fixes${NC}"
50+
# Configure WSL if needed
51+
if ! grep -q "generateResolvConf" /etc/wsl.conf 2>/dev/null; then
52+
echo -e "${CYAN}*************** Configuring WSL settings${NC}"
53+
cat << EOF >> /etc/wsl.conf
5154
[network]
5255
generateResolvConf=false
5356
hostname=$DEVICE_ID
5457
EOF
55-
fi
58+
fi
5659

57-
# Configure DNS if needed
58-
if ! grep -q "nameserver 8.8.8.8" /etc/resolv.conf 2>/dev/null; then
59-
echo -e "${CYAN}*************** Configuring DNS${NC}"
60-
mountpoint -q /etc/resolv.conf 2>/dev/null && umount /etc/resolv.conf || true
61-
cat > /etc/resolv.conf << EOF
60+
# Configure DNS if needed
61+
if ! grep -q "nameserver 8.8.8.8" /etc/resolv.conf 2>/dev/null; then
62+
echo -e "${CYAN}*************** Configuring DNS${NC}"
63+
mountpoint -q /etc/resolv.conf 2>/dev/null && umount /etc/resolv.conf || true
64+
cat > /etc/resolv.conf << EOF
6265
nameserver 8.8.8.8
6366
nameserver 1.1.1.1
6467
EOF
65-
chattr +i /etc/resolv.conf 2>/dev/null || true
68+
chattr +i /etc/resolv.conf 2>/dev/null || true
69+
fi
6670
fi
6771

6872
wget https://packages.microsoft.com/config/ubuntu/24.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb

0 commit comments

Comments
 (0)