diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-10-24 21:20:44 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-10-24 21:22:18 +0200 |
| commit | 3c600cab7ca96a3aafdaa802266e04ef93e2a602 (patch) | |
| tree | 350b1a9ddfa65adf703332e5a127d7a3097014ab | |
| parent | 71d9aca5c4d898649bbba429c7337eaf5514f2e0 (diff) | |
| download | vyatta-cfg-3c600cab7ca96a3aafdaa802266e04ef93e2a602.tar.gz vyatta-cfg-3c600cab7ca96a3aafdaa802266e04ef93e2a602.zip | |
vyos-router: dhcpv6: T3885: add alternative UUID source
Not all boards/devices ship the /sys/class/dmi/id/product_uuid file, thus a
fallback is used (e.g. on PCEngines APU4 board) which feeds the device specific
UUID from /sys/class/dmi/id/product_serial
(cherry picked from commit 224941480bb5e41ee6b43e3bf0f357568f18d44f)
| -rw-r--r-- | debian/control | 1 | ||||
| -rwxr-xr-x | scripts/init/vyos-router | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/debian/control b/debian/control index edbeee7..0836fe8 100644 --- a/debian/control +++ b/debian/control @@ -21,6 +21,7 @@ Depends: sed (>= 4.1.5), systemd, libboost-filesystem1.55.0 | libboost-filesystem1.62.0 | libboost-filesystem1.67.0, libapt-pkg4.12 | libapt-pkg5.0, + uuid-runtime, ${perl:Depends}, ${shlibs:Depends} Suggests: util-linux (>= 2.13-5), net-tools, diff --git a/scripts/init/vyos-router b/scripts/init/vyos-router index 7863bd9..2582736 100755 --- a/scripts/init/vyos-router +++ b/scripts/init/vyos-router @@ -178,12 +178,16 @@ gen_duid () { DUID_FILE="/var/lib/dhcpv6/dhcp6c_duid" UUID_FILE="/sys/class/dmi/id/product_uuid" - if [ ! -f ${UUID_FILE} ]; then + UUID_FILE_ALT="/sys/class/dmi/id/product_serial" + if [ ! -f ${UUID_FILE} ] && [ ! -f ${UUID_FILE_ALT} ]; then return 1 fi # DUID is based on the BIOS/EFI UUID. We omit additional - characters UUID=$(cat ${UUID_FILE} | tr -d -) + if [ -z ${UUID} ]; then + UUID=$(uuidgen --sha1 --namespace @dns --name $(cat ${UUID_FILE_ALT}) | tr -d -) + fi # Add DUID type4 (UUID) information DUID_TYPE="0004" |