← Back to branch summary

~xintx-ua/ubuntu-n900/unstable

« back to all changes in this revision

Viewing changes to install.sh

  • Committer: Serhiy Zahoriya
  • Date: 2012-09-25 20:27:13 UTC
  • Revision ID: xintx.ua@gmail.com-20120925202713-dn2i076kc26el242
awesome + some changes by riv64

Show diffs side-by-side

added added

removed removed

Lines of Context:
install.sh
96
96
    lubuntu-desktop     "optional" off \
97
97
    lxdm                 "optional" off \
98
98
    e17                  "optional" off \
99
 
    connman                  "network manager for e17" off \
 
99
    connman         "network manager for e17" off \
 
100
    awesome         "optional" off \
 
101
    awesome-extra   "optional" off \
100
102
    wicd-gtk        "Alternative network manager" off \
101
103
    wicd-curses     "ncurses version" off \
102
104
    network-manager "optional" off \
132
134
    apport          "optional" off \
133
135
    onboard         "optional" off \
134
136
    imagemagick     "optional" off \
135
 
    man-db          "recommended" on \
 
137
    man-db          "recommended" off \
 
138
    wget            "optional" off \
 
139
    kbd                 "optional" off \
 
140
    xinit           "startx" off \
 
141
    acpi-support-base "optional" off \
 
142
    initramfs-tools "optional" off \
136
143
    2>"${options_dir}additional_packages"
137
144
sed -i 's/\"//g' "${options_dir}additional_packages"
138
145
 
173
180
        exit 1
174
181
    fi
175
182
 
176
 
    read -p "FAT partition size in mebibytes (defaults to 500):" fat_size
 
183
    read -p "FAT partition size in mebibytes (defaults to 50):" fat_size
177
184
    #read -p "Root partition size in gibibytes:" root_size
178
185
    read -p "Swap disk size in mebibytes (0 for no swap, defaults to 500):" swap_size
179
186
 
180
187
    fat_size="$(echo $fat_size | grep -o [0-9]*)"
181
188
    swap_size="$(echo $swap_size | grep -o [0-9]*)"
182
189
    if [[ $fat_size == "" ]]; then
183
 
      fat_size="500"
 
190
      fat_size="50"
184
191
    fi
185
192
    if [[ $swap_size == "" ]]; then
186
193
      swap_size="500"
325
332
#bzr branch lp:~panzersajt/ubuntu-n900-accessories/trunk || cd trunk; bzr pull; cd ..
326
333
 
327
334
# Workarounds
328
 
#cp trunk/control-panel-alpha.sh ${mountpoint_target}usr/bin/
 
335
#cp trunk/control-panel.sh ${mountpoint_target}usr/bin/
329
336
#cp trunk/charge.sh ${mountpoint_target}usr/bin/
330
337
echo -e "\nproc /proc proc nodev,noexec,nosuid 0 0\n" >> "${mountpoint_target}etc/fstab"
331
338
if [[ $swap_size > 0 && $target_type == "disk" ]]; then
378
385
#    chroot_failed=1
379
386
    echo "Chroot failed. Unmounting..."
380
387
    sync
381
 
    
 
388
  
382
389
    # http://askubuntu.com/a/166956/20275
383
390
    for root in /proc/*/root; do
384
391
        link=$(readlink $root)
389
396
            fi
390
397
        fi
391
398
    done
392
 
    
 
399
 
 
400
    fuser -k /mnt
 
401
 
393
402
    umount "${mountpoint_target}dev/pts" "${mountpoint_target}dev" "${mountpoint_target}proc" "${mountpoint_target}sys" "$mountpoint_target" "$mountpoint_mmc_fat"
394
403
    echo "$( cd "${options_dir}"; grep ^ * | grep -v fdisk_command_stack)"
395
404
    exit 1
432
441
        fi
433
442
    fi
434
443
done
435
 
# but these daemons respawn faster than any other
 
444
 
 
445
fuser -k /mnt
436
446
 
437
447
umount "${mountpoint_target}dev/pts" "${mountpoint_target}dev" "${mountpoint_target}proc" "${mountpoint_target}sys" "$mountpoint_target" "$mountpoint_mmc_fat"
438
448
if [[ $target_type == "disk" ]]; then