Merge remote-tracking branch 'upstream/master' into dual-bootdual-v37

2 files changed, 2 insertions, 2 deletions

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index cc66df4..4d4db50 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -266,8 +266,7 @@ command_pkglist () {
     _show_config pkglist
 
     _msg_info "Creating a list of installed packages on live-enviroment..."
-    pacman -Sl --sysroot "${work_dir}/airootfs" | \
-        awk '/\[installed\]$/ {print $1 "/" $2 "-" $3}' > \
+    pacman -Q --sysroot "${work_dir}/airootfs" > \
         "${work_dir}/iso/${install_dir}/pkglist.${arch}.txt"
     _msg_info "Done!"
 
diff --git a/configs/releng/packages.both b/configs/releng/packages.both
index bae8238..45798cc 100644
--- a/configs/releng/packages.both
+++ b/configs/releng/packages.both
@@ -58,6 +58,7 @@ usb_modeswitch
 vim-minimal
 vpnc
 wget
+wireless-regdb
 wireless_tools
 wpa_actiond
 wvdial