Skip to content

Commit 3883984

Browse files
committed
flatcar-postinst: Remove old Azure workaround
The workaround for instances migrated from CoreOS shouldn't be needed anymore, especially if we are now migrating the OEM partition contents to the new setup with the OEM systemd-sysext image. Remove the old Azure workaround.
1 parent 81d4c25 commit 3883984

File tree

1 file changed

+0
-13
lines changed

1 file changed

+0
-13
lines changed

flatcar-postinst

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -119,19 +119,6 @@ EOF
119119
systemctl start --no-block locksmithd-kicker.timer
120120
fi
121121

122-
# Azure's agent erroneously looks at the distribution name instead of its ID.
123-
# This prevents us from renaming the OS from "Flatcar". This patches platform.py
124-
# to always return "Flatcar" as the distribution name.
125-
PLATFORM_PATH="/usr/share/oem/python/lib64/python2.7/platform.py"
126-
if [ -e ${PLATFORM_PATH} ]; then
127-
sum=($(md5sum ${PLATFORM_PATH}))
128-
if [ ${sum} == "6315addf42c0b07f5f78d119b578e20a" ]; then
129-
sed --in-place \
130-
"s%distname = os_release_info\['NAME'\]%distname = \"Flatcar\"%" \
131-
${PLATFORM_PATH}
132-
fi
133-
fi
134-
135122
# Gather metadata about upcoming OS image.
136123
# shellcheck source=/dev/null
137124
source "${INSTALL_MNT}/lib/os-release"

0 commit comments

Comments
 (0)