Commit 80250e58 by iv

Fix cfg + improve run in re6st scripts.

1 parent 37b63740
...@@ -40,7 +40,7 @@ else ...@@ -40,7 +40,7 @@ else
echo "Configuration will be placed in ${configfile}, please do manually backup later or you could lose your access." echo "Configuration will be placed in ${configfile}, please do manually backup later or you could lose your access."
fi fi
#re6st-conf --registry "${registry}" --token "${token}" --dir "${configdir}" re6st-conf --registry "${registry}" --token "${token}" --dir "${configdir}"
printf '%s\n' "${options[@]}" >> "${configfile}" printf '%s\n' "${options[@]}" >> "${configfile}"
......
...@@ -48,7 +48,7 @@ else ...@@ -48,7 +48,7 @@ else
fi fi
if [ -r "${path}/re6stnet.conf" -a -r "${path}/cert.crt" -a -r "${path}/cert.key" -a -r "${path}/ca.crt" ]; then if [ -r "${path}/re6stnet.conf" -a -r "${path}/cert.crt" -a -r "${path}/cert.key" -a -r "${path}/ca.crt" ]; then
install -d "${configdir}" install -d "${configdir}"
for file in "${path}"; do for file in "${path}"/* ; do
install -m 600 "${file}" "${configdir}" install -m 600 "${file}" "${configdir}"
done done
else else
...@@ -106,17 +106,23 @@ else ...@@ -106,17 +106,23 @@ else
stop shill stop shill
fi fi
start shill BLACKLISTED_DEVICES="${blacklist_option}" start shill BLACKLISTED_DEVICES="${blacklist_option}"
# wait a bit for the interfaces to be back
for i in {0..4} ; do
echo -n "." ; sleep 1
done
echo ""
fi fi
fi fi
read -p "Should the interface accept router advertisement via IPv6 [y/N]? " accept_ra read -p "Should the interface accept router advertisement via IPv6 [y/N]? " accept_ra
interface_names="$( ip -o link show | awk -F': ' '{print $2}' )" interface="$( ip -o link show | grep 'state UP' | awk -F': ' '{print $2}')"
interface="$( ip -o link show | grep 'state UP' | awk -F': ' '{print $2}' || echo ${interface_names} | grep 0 || echo ${interface_names} | grep 1)"
read -p "Is '${interface}' the name of the interface that is used to access the Internet (via IPv4) [Y/n]? " confirm read -p "Is '${interface}' the name of the interface that is used to access the Internet (via IPv4) [Y/n]? " confirm
if [ "$confirm" != "y" -a "$confirm" != "Y" -a "$confirm" != "" ] ; then if [ "$confirm" != "y" -a "$confirm" != "Y" -a "$confirm" != "" ] ; then
printf "running interfaces found:\n${interface_names}\n" echo "running interfaces found:"
echo "$( ip -o link show | awk -F': ' '{print $2}' )"
read -p "name of the interface used to access the Internet (via IPv4): " interface read -p "name of the interface used to access the Internet (via IPv4): " interface
fi fi
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!