← Back to branch summary

~mterry/ubiquity/oem-config-merge

« back to all changes in this revision

Viewing changes to debian/rules

  • Committer: Michael Terry
  • Date: 2009-07-13 19:45:00 UTC
  • Revision ID: michael.terry@canonical.com-20090713194500-ml8n8lf7szsbn2kz
only disallow oem as a name in OEM_USER_CONFIG mode

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/rules
197
197
        sed -i -e 's,db_input medium tzsetup/selected,db_input high tzsetup/selected,' \
198
198
               -e 's,/usr/share/tzsetup/tzmap,/usr/lib/ubiquity/tzsetup/tzmap,g' \
199
199
                debian/ubiquity/usr/lib/ubiquity/tzsetup/tzsetup
 
200
        cp debian/ubiquity/usr/lib/ubiquity/user-setup/reserved-usernames \
 
201
                debian/ubiquity/usr/lib/ubiquity/user-setup/reserved-usernames-oem
 
202
        echo oem >> debian/ubiquity/usr/lib/ubiquity/user-setup/reserved-usernames-oem
200
203
        set -e; for x in user-setup user-setup-ask user-setup-apply; do \
201
204
                sed -e 's,/usr/lib/user-setup,/usr/lib/ubiquity/user-setup,g' \
202
205
                    -e 's,/bin/sh,/bin/bash,g' \
206
209
        done
207
210
        sed -i -e 's,db_input high user-setup/encrypt-home,db_input medium user-setup/encrypt-home,' \
208
211
                debian/ubiquity/usr/lib/ubiquity/user-setup/user-setup-ask
 
212
        sed -e 's,reserved-usernames,reserved-usernames-oem,g' \
 
213
                debian/ubiquity/usr/lib/ubiquity/user-setup/user-setup-ask \
 
214
                > debian/ubiquity/usr/lib/ubiquity/user-setup/user-setup-ask-oem
 
215
        chmod +x debian/ubiquity/usr/lib/ubiquity/user-setup/user-setup-ask-oem
209
216
        mkdir -p debian/oem-config/usr/lib/ubiquity/debian-installer-utils
210
217
        sed -e 's,/target/,/,g;s,/target,/,g' \
211
218
                d-i/source/debian-installer-utils/register-module.post-base-installer \
212
219
                > debian/oem-config/usr/lib/ubiquity/debian-installer-utils/register-module.post-base-installer-oem
213
220
        chmod +x debian/oem-config/usr/lib/ubiquity/debian-installer-utils/register-module.post-base-installer-oem
214
 
        echo oem >> debian/ubiquity/usr/lib/ubiquity/user-setup/reserved-usernames
215
221
ifeq ($(DEB_HOST_ARCH),armel)
216
222
        dh_installdirs -pubiquity usr/lib/ubiquity/flash-kernel
217
223
        install d-i/source/flash-kernel/debian/flash-kernel-installer.postinst \